diff options
author | Ian Kent <raven@themaw.net> | 2009-12-15 19:45:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:19:58 -0500 |
commit | aa952eb26d4344fdad44c104f3c298d3130c53da (patch) | |
tree | 4a49859b272d8d42ae7fa68c5d30f6aa2fd82742 /fs/autofs4/autofs_i.h | |
parent | 36b6413ef301d30f60037e497ecb902897895473 (diff) |
autofs4: use autofs_info for pending flag
Eliminate the use of the d_lock spin lock by using the autofs super block
info spin lock. This reduces the number of spin locks we use by one and
makes the code for the following patch (to redirect ->d_revalidate() to
->lookup()) a little simpler.
Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Sage Weil <sage@newdream.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Yehuda Saheh <yehuda@newdream.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs4/autofs_i.h')
-rw-r--r-- | fs/autofs4/autofs_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index fe9fc235ee75..3d283abf67d7 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h | |||
@@ -97,6 +97,7 @@ struct autofs_info { | |||
97 | 97 | ||
98 | #define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */ | 98 | #define AUTOFS_INF_EXPIRING (1<<0) /* dentry is in the process of expiring */ |
99 | #define AUTOFS_INF_MOUNTPOINT (1<<1) /* mountpoint status for direct expire */ | 99 | #define AUTOFS_INF_MOUNTPOINT (1<<1) /* mountpoint status for direct expire */ |
100 | #define AUTOFS_INF_PENDING (1<<2) /* dentry pending mount */ | ||
100 | 101 | ||
101 | struct autofs_wait_queue { | 102 | struct autofs_wait_queue { |
102 | wait_queue_head_t queue; | 103 | wait_queue_head_t queue; |
@@ -163,7 +164,7 @@ static inline int autofs4_ispending(struct dentry *dentry) | |||
163 | { | 164 | { |
164 | struct autofs_info *inf = autofs4_dentry_ino(dentry); | 165 | struct autofs_info *inf = autofs4_dentry_ino(dentry); |
165 | 166 | ||
166 | if (dentry->d_flags & DCACHE_AUTOFS_PENDING) | 167 | if (inf->flags & AUTOFS_INF_PENDING) |
167 | return 1; | 168 | return 1; |
168 | 169 | ||
169 | if (inf->flags & AUTOFS_INF_EXPIRING) | 170 | if (inf->flags & AUTOFS_INF_EXPIRING) |