aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJan Blunck <jblunck@infradead.org>2010-08-15 16:51:10 -0400
committerArnd Bergmann <arnd@arndb.de>2010-10-04 15:10:10 -0400
commitdb71922217a214e5c9268448e537b54fc1f301ea (patch)
tree9c9afbf29411547891f6968e5ade29ce59d66c07 /fs/cifs
parent899611ee7d373e5eeda08e9a8632684e1ebbbf00 (diff)
BKL: Explicitly add BKL around get_sb/fill_super
This patch is a preparation necessary to remove the BKL from do_new_mount(). It explicitly adds calls to lock_kernel()/unlock_kernel() around get_sb/fill_super operations for filesystems that still uses the BKL. I've read through all the code formerly covered by the BKL inside do_kern_mount() and have satisfied myself that it doesn't need the BKL any more. do_kern_mount() is already called without the BKL when mounting the rootfs and in nfsctl. do_kern_mount() calls vfs_kern_mount(), which is called from various places without BKL: simple_pin_fs(), nfs_do_clone_mount() through nfs_follow_mountpoint(), afs_mntpt_do_automount() through afs_mntpt_follow_link(). Both later functions are actually the filesystems follow_link inode operation. vfs_kern_mount() is calling the specified get_sb function and lets the filesystem do its job by calling the given fill_super function. Therefore I think it is safe to push down the BKL from the VFS to the low-level filesystems get_sb/fill_super operation. [arnd: do not add the BKL to those file systems that already don't use it elsewhere] Signed-off-by: Jan Blunck <jblunck@infradead.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsfs.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b7431afdd76..070bf1aecd2 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -514,22 +514,30 @@ cifs_get_sb(struct file_system_type *fs_type,
514 int flags, const char *dev_name, void *data, struct vfsmount *mnt) 514 int flags, const char *dev_name, void *data, struct vfsmount *mnt)
515{ 515{
516 int rc; 516 int rc;
517 struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); 517 struct super_block *sb;
518
519 lock_kernel();
520
521 sb = sget(fs_type, NULL, set_anon_super, NULL);
518 522
519 cFYI(1, "Devname: %s flags: %d ", dev_name, flags); 523 cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
520 524
521 if (IS_ERR(sb)) 525 if (IS_ERR(sb)) {
526 unlock_kernel();
522 return PTR_ERR(sb); 527 return PTR_ERR(sb);
528 }
523 529
524 sb->s_flags = flags; 530 sb->s_flags = flags;
525 531
526 rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); 532 rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
527 if (rc) { 533 if (rc) {
528 deactivate_locked_super(sb); 534 deactivate_locked_super(sb);
535 unlock_kernel();
529 return rc; 536 return rc;
530 } 537 }
531 sb->s_flags |= MS_ACTIVE; 538 sb->s_flags |= MS_ACTIVE;
532 simple_set_mnt(mnt, sb); 539 simple_set_mnt(mnt, sb);
540 unlock_kernel();
533 return 0; 541 return 0;
534} 542}
535 543