Because of the changes made in dcache.h header file, files that
use the d_lock field of the dentry structure need to be changed
accordingly. All the d_lock's spin_lock() and spin_unlock() calls
are replaced by the corresponding d_lock() and d_unlock() calls.
There is no change in logic and everything should just work.
Signed-off-by: Waiman Long <Waiman.Long@xxxxxx>
---
fs/9p/fid.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index d51ec9f..fc23dd3 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -48,9 +48,9 @@ static inline void __add_fid(struct dentry *dentry, struct p9_fid *fid)
void v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
{
- spin_lock(&dentry->d_lock);
+ d_lock(dentry);
__add_fid(dentry, fid);
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
}
/**
@@ -72,14 +72,14 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
/* we'll recheck under lock if there's anything to look in */
if (dentry->d_fsdata) {
struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;
- spin_lock(&dentry->d_lock);
+ d_lock(dentry);
hlist_for_each_entry(fid, h, dlist) {
if (any || uid_eq(fid->uid, uid)) {
ret = fid;
break;
}
}
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
}
return ret;
@@ -203,14 +203,14 @@ static struct p9_fid *v9fs_fid_lookup_with_uid(struct dentry *dentry,
kfree(wnames);
fid_out:
if (!IS_ERR(fid)) {
- spin_lock(&dentry->d_lock);
+ d_lock(dentry);
if (d_unhashed(dentry)) {
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
p9_client_clunk(fid);
fid = ERR_PTR(-ENOENT);
} else {
__add_fid(dentry, fid);
- spin_unlock(&dentry->d_lock);
+ d_unlock(dentry);
}
}
err_out:
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
