diff options
author | Christoph Hellwig <hch@lst.de> | 2009-05-05 09:40:36 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:07 -0400 |
commit | 6cfd0148425e528b859b26e436b01f23f6926224 (patch) | |
tree | 60e3257053554ff198fe5825e6f12a00c3b4422a /fs/cifs/cifsfs.c | |
parent | a9e220f8322e2b0e0b8903fe00265461cffad3f0 (diff) |
push BKL down into ->put_super
Move BKL into ->put_super from the only caller. A couple of
filesystems had trivial enough ->put_super (only kfree and NULLing of
s_fs_info + stuff in there) to not get any locking: coda, cramfs, efs,
hugetlbfs, omfs, qnx4, shmem, all others got the full treatment. Most
of them probably don't need it, but I'd rather sort that out individually.
Preferably after all the other BKL pushdowns in that area.
[AV: original used to move lock_super() down as well; these changes are
removed since we don't do lock_super() at all in generic_shutdown_super()
now]
[AV: fuse, btrfs and xfs are known to need no damn BKL, exempt]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 0a10a59b6392..0d92114195ab 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -204,6 +204,9 @@ cifs_put_super(struct super_block *sb) | |||
204 | cFYI(1, ("Empty cifs superblock info passed to unmount")); | 204 | cFYI(1, ("Empty cifs superblock info passed to unmount")); |
205 | return; | 205 | return; |
206 | } | 206 | } |
207 | |||
208 | lock_kernel(); | ||
209 | |||
207 | rc = cifs_umount(sb, cifs_sb); | 210 | rc = cifs_umount(sb, cifs_sb); |
208 | if (rc) | 211 | if (rc) |
209 | cERROR(1, ("cifs_umount failed with return code %d", rc)); | 212 | cERROR(1, ("cifs_umount failed with return code %d", rc)); |
@@ -216,7 +219,8 @@ cifs_put_super(struct super_block *sb) | |||
216 | 219 | ||
217 | unload_nls(cifs_sb->local_nls); | 220 | unload_nls(cifs_sb->local_nls); |
218 | kfree(cifs_sb); | 221 | kfree(cifs_sb); |
219 | return; | 222 | |
223 | unlock_kernel(); | ||
220 | } | 224 | } |
221 | 225 | ||
222 | static int | 226 | static int |