UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

BKL: Remove BKL from CifsFS 

The BKL is only used in put_super and fill_super that are both protected by
the superblocks s_umount rw_semaphore. Therefore it is safe to remove the
BKL entirely.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
Cc: Steve French <smfrench@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Jan Blunck 2010-02-24 13:25:29 +01:00 committed by Arnd Bergmann
parent ba13d597a6
commit b0991aa324
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/cifs/cifsfs.c
View File

@ -35,7 +35,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/smp_lock.h>
#include "cifsfs.h" #include "cifsfs.h"
#include "cifspdu.h" #include "cifspdu.h"
#define DECLARE_GLOBALS_HERE #define DECLARE_GLOBALS_HERE
@ -200,8 +199,6 @@ cifs_put_super(struct super_block *sb)
return; return;
} }
lock_kernel();
rc = cifs_umount(sb, cifs_sb); rc = cifs_umount(sb, cifs_sb);
if (rc) if (rc)
cERROR(1, "cifs_umount failed with return code %d", rc); cERROR(1, "cifs_umount failed with return code %d", rc);
@ -215,8 +212,6 @@ cifs_put_super(struct super_block *sb)
unload_nls(cifs_sb->local_nls); unload_nls(cifs_sb->local_nls);
bdi_destroy(&cifs_sb->bdi); bdi_destroy(&cifs_sb->bdi);
kfree(cifs_sb); kfree(cifs_sb);
unlock_kernel();
} }
static int static int
@ -516,28 +511,22 @@ cifs_get_sb(struct file_system_type *fs_type,
int rc; int rc;
struct super_block *sb; struct super_block *sb;
lock_kernel();
sb = sget(fs_type, NULL, set_anon_super, NULL); sb = sget(fs_type, NULL, set_anon_super, NULL);
cFYI(1, "Devname: %s flags: %d ", dev_name, flags); cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
if (IS_ERR(sb)) { if (IS_ERR(sb))
unlock_kernel();
return PTR_ERR(sb); return PTR_ERR(sb);
}
sb->s_flags = flags; sb->s_flags = flags;
rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0); rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
if (rc) { if (rc) {
deactivate_locked_super(sb); deactivate_locked_super(sb);
unlock_kernel();
return rc; return rc;
} }
sb->s_flags |= MS_ACTIVE; sb->s_flags |= MS_ACTIVE;
simple_set_mnt(mnt, sb); simple_set_mnt(mnt, sb);
unlock_kernel();
return 0; return 0;
} }