ocfs2: Change how dentry's d_lock field is accessed
PATCH v3 22/25 ocfs2: 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.
--- fs/ocfs2/dcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
fs/ocfs2/dcache.c +3 -3
@@ -173,17 +173,17 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,spin_lock (&inode->i_lock);hlist_for_each_entry (dentry, &inode->i_dentry, d_alias) { -spin_lock (&dentry->d_lock); +d_lock (dentry);if (ocfs2_match_dentry (dentry, parent_blkno, skip_unhashed)) {trace_ocfs2_find_local_alias (dentry->d_name.len, dentry->d_name.name);dget_dlock (dentry); -spin_unlock (&dentry->d_lock); +d_unlock (dentry);spin_unlock (&inode->i_lock);return dentry; } -spin_unlock (&dentry->d_lock); +d_unlock (dentry); }spin_unlock (&inode->i_lock);return NULL ;
Signature · 1 line
1.7.1
Joel Becker
maintainerQuoted 7 lines · Waiman Long
Because of the changes made in
dcache.hheader file, files that use thed_lockfield of the dentry structure need to be changed accordingly. All the d_lock'sspin_lock()andspin_unlock()calls are replaced by the correspondingd_lock()andd_unlock()calls. There is no change in logic and everything should just work.Signed-off-by Waiman Long <[email protected]>
This looks reasonable, but I'll wait for the followup from Linus' review.
Joel
Quoted 32 lines
--- fs/ocfs2/dcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)fs/ocfs2/dcache.c +3
-3@@ -173,17 +173,17 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,spin_lock (&inode->i_lock);hlist_for_each_entry (dentry, &inode->i_dentry, d_alias) { -spin_lock (&dentry->d_lock); +d_lock (dentry);if (ocfs2_match_dentry (dentry, parent_blkno, skip_unhashed)) {trace_ocfs2_find_local_alias (dentry->d_name.len, dentry->d_name.name);dget_dlock (dentry); -spin_unlock (&dentry->d_lock); +d_unlock (dentry);spin_unlock (&inode->i_lock);return dentry; } -spin_unlock (&dentry->d_lock); +d_unlock (dentry); }spin_unlock (&inode->i_lock);return NULL ;Signature · 1 line
1.7.1
Signature · 7 lines
"Where are my angels? Where's my golden one? And where is my hope Now that my heroes are gone?" http://www.jlbec.org/ [email protected]