diff options
| author |   Ian Kent <raven@themaw.net> | 2011-03-25 01:51:31 +0800 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2011-03-24 14:54:35 -0400 |
| commit | e7854723d0f3626f260c880d8db8e5136f29db19 (patch) | |
| tree | 3fe4f138922f51d8214ccc6bd2fb9ed4dfa1f234 /fs/autofs4/waitq.c | |
| parent | autofs4 - fix d_manage() return on rcu-walk (diff) | |
| download | linux-dev-e7854723d0f3626f260c880d8db8e5136f29db19.tar.xz linux-dev-e7854723d0f3626f260c880d8db8e5136f29db19.zip | |
autofs4 - remove autofs4_lock
The autofs4_lock introduced by the rcu-walk changes has unnecessarily
broad scope. The locking is better handled by the per-autofs super
block lookup_lock.
Signed-off-by: Ian Kent <raven@themaw.net>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/waitq.c')
| -rw-r--r-- | fs/autofs4/waitq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index 56010056b2e6..25435987d6ae 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -197,12 +197,12 @@ rename_retry: seq = read_seqbegin(&rename_lock); rcu_read_lock(); - spin_lock(&autofs4_lock); + spin_lock(&sbi->fs_lock); for (tmp = dentry ; tmp != root ; tmp = tmp->d_parent) len += tmp->d_name.len + 1; if (!len || --len > NAME_MAX) { - spin_unlock(&autofs4_lock); + spin_unlock(&sbi->fs_lock); rcu_read_unlock(); if (read_seqretry(&rename_lock, seq)) goto rename_retry; @@ -218,7 +218,7 @@ rename_retry: p -= tmp->d_name.len; strncpy(p, tmp->d_name.name, tmp->d_name.len); } - spin_unlock(&autofs4_lock); + spin_unlock(&sbi->fs_lock); rcu_read_unlock(); if (read_seqretry(&rename_lock, seq)) goto rename_retry; |