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/smbfs | |
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/smbfs')
-rw-r--r-- | fs/smbfs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index fc27fbfc5397..1402d2d54f52 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
@@ -474,6 +474,8 @@ smb_put_super(struct super_block *sb) | |||
474 | { | 474 | { |
475 | struct smb_sb_info *server = SMB_SB(sb); | 475 | struct smb_sb_info *server = SMB_SB(sb); |
476 | 476 | ||
477 | lock_kernel(); | ||
478 | |||
477 | smb_lock_server(server); | 479 | smb_lock_server(server); |
478 | server->state = CONN_INVALID; | 480 | server->state = CONN_INVALID; |
479 | smbiod_unregister_server(server); | 481 | smbiod_unregister_server(server); |
@@ -489,6 +491,8 @@ smb_put_super(struct super_block *sb) | |||
489 | smb_unlock_server(server); | 491 | smb_unlock_server(server); |
490 | put_pid(server->conn_pid); | 492 | put_pid(server->conn_pid); |
491 | kfree(server); | 493 | kfree(server); |
494 | |||
495 | unlock_kernel(); | ||
492 | } | 496 | } |
493 | 497 | ||
494 | static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) | 498 | static int smb_fill_super(struct super_block *sb, void *raw_data, int silent) |