diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 08:46:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 08:46:57 -0700 |
| commit | feb72ce827b939d5228664c92c2dfed7753cae46 (patch) | |
| tree | de2d78ee45d9e0df234e98eea67ebc3a21525d8f /fs/befs | |
| parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (diff) | |
| parent | 5ac3455a843d2ca77333c954eea83aa4514c8199 (diff) | |
| download | kernel-common-feb72ce827b939d5228664c92c2dfed7753cae46.tar.gz kernel-common-feb72ce827b939d5228664c92c2dfed7753cae46.tar.bz2 kernel-common-feb72ce827b939d5228664c92c2dfed7753cae46.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
get rid of BKL in fs/sysv
get rid of BKL in fs/minix
get rid of BKL in fs/efs
befs ->pust_super() doesn't need BKL
Cleanup of adfs headers
9P doesn't need BKL in ->umount_begin()
fuse doesn't need BKL in ->umount_begin()
No instance of ->bmap() needs BKL
remove unlock_kernel() left accidentally
ext4: avoid unnecessary spinlock in critical POSIX ACL path
ext3: avoid unnecessary spinlock in critical POSIX ACL path
Diffstat (limited to 'fs/befs')
| -rw-r--r-- | fs/befs/linuxvfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 89cd2deeb4af..615d5496fe0f 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -735,8 +735,6 @@ parse_options(char *options, befs_mount_options * opts) static void befs_put_super(struct super_block *sb) { - lock_kernel(); - kfree(BEFS_SB(sb)->mount_opts.iocharset); BEFS_SB(sb)->mount_opts.iocharset = NULL; @@ -747,8 +745,6 @@ befs_put_super(struct super_block *sb) kfree(sb->s_fs_info); sb->s_fs_info = NULL; - - unlock_kernel(); } /* Allocate private field of the superblock, fill it. |