auto-fs: replace direct access of d_count with the d_count() helper
Subsystems (2)
PATCH v5 4/12 auto-fs: replace direct access of d_count with the d_count() helper
Because of the d_count change made in dcache.h, all readonly references to d_count have to be changed to use the new d_count() helper as they shouldn't access its value directly. There is no change in logic and everything should just work.
Signed-off-by Waiman Long <[email protected]>
--- fs/autofs4/expire.c | 8 ++++---- fs/autofs4/root.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/autofs4/expire.c +4 -4
@@ -109,7 +109,7 @@ cont:spin_lock_nested (&q->d_lock,DENTRY_D_LOCK_NESTED );/* Already gone or negative dentry (under construction) - try next */ -if (q->d_count ==0 || !simple_positive (q)) { +if (d_count (q) ==0 || !simple_positive (q)) {spin_unlock (&q->d_lock); next = q->d_u.d_child.next; goto cont;
@@ -267,7 +267,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt,else ino_count++; -if (p->d_count > ino_count) { +if (d_count (p) > ino_count) { top_ino->last_used = jiffies;dput (p);return 1 ;
@@ -409,7 +409,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,if (!exp_leaves) {/* Path walk currently on this dentry? */ ino_count =atomic_read (&ino->count) +1 ; -if (dentry->d_count > ino_count) +if (d_count (dentry) > ino_count) goto next;if (!autofs4_tree_busy (mnt, dentry, timeout, do_now)) {
@@ -423,7 +423,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, }else {/* Path walk currently on this dentry? */ ino_count =atomic_read (&ino->count) +1 ; -if (dentry->d_count > ino_count) +if (d_count (dentry) > ino_count) goto next; expired =autofs4_check_leaves (mnt, dentry, timeout, do_now);
fs/autofs4/root.c +1 -1
@@ -179,7 +179,7 @@ static struct dentry *autofs4_lookup_active(struct dentry *dentry)spin_lock (&active->d_lock);/* Already gone? */ -if (active->d_count ==0 ) +if (d_count (active) ==0 ) goto next; qstr = &active->d_name;
Signature · 1 line
1.7.1