ncp-fs: Change how dentry's d_lock field is accessed
PATCH v3 18/25 ncp-fs: Change how dentry's d_lock field is accessed
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 <[email protected]>
--- fs/ncpfs/dir.c | 6 +++--- fs/ncpfs/ncplib_kernel.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
fs/ncpfs/dir.c +3 -3
@@ -388,7 +388,7 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos) }/* If a pointer is invalid, we search the dentry. */ -spin_lock (&parent->d_lock); +d_lock (parent); next = parent->d_subdirs.next;while (next != &parent->d_subdirs) { dent = list_entry(next, struct dentry, d_u.d_child);
@@ -397,12 +397,12 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos)dget (dent); else dent =NULL ; -spin_unlock (&parent->d_lock); +d_unlock (parent); goto out; } next = next->next; } -spin_unlock (&parent->d_lock); +d_unlock (parent);return NULL ; out:
fs/ncpfs/ncplib_kernel.h +4 -4
@@ -191,7 +191,7 @@ ncp_renew_dentries(struct dentry *parent)struct list_head *next;struct dentry *dentry; -spin_lock (&parent->d_lock); +d_lock (parent); next = parent->d_subdirs.next;while (next != &parent->d_subdirs) { dentry = list_entry(next, struct dentry, d_u.d_child);
@@ -203,7 +203,7 @@ ncp_renew_dentries(struct dentry *parent) next = next->next; } -spin_unlock (&parent->d_lock); +d_unlock (parent); } static inline void
@@ -213,7 +213,7 @@ ncp_invalidate_dircache_entries(struct dentry *parent)struct list_head *next;struct dentry *dentry; -spin_lock (&parent->d_lock); +d_lock (parent); next = parent->d_subdirs.next;while (next != &parent->d_subdirs) { dentry = list_entry(next, struct dentry, d_u.d_child);
@@ -221,7 +221,7 @@ ncp_invalidate_dircache_entries(struct dentry *parent)ncp_age_dentry (server, dentry); next = next->next; } -spin_unlock (&parent->d_lock); +d_unlock (parent); }struct ncp_cache_head {
Signature · 1 line
1.7.1