diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:01 -0400 |
commit | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (patch) | |
tree | 3bb53b7806c1baba6cc24b91724a9264cceccd39 /fs/fat/inode.c | |
parent | c37927d4359e81b85de644f8fb08878717cf5f3f (diff) | |
parent | 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 (diff) |
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: (30 commits)
BKL: remove BKL from freevxfs
BKL: remove BKL from qnx4
autofs4: Only declare function when CONFIG_COMPAT is defined
autofs: Only declare function when CONFIG_COMPAT is defined
ncpfs: Lock socket in ncpfs while setting its callbacks
fs/locks.c: prepare for BKL removal
BKL: Remove BKL from ncpfs
BKL: Remove BKL from OCFS2
BKL: Remove BKL from squashfs
BKL: Remove BKL from jffs2
BKL: Remove BKL from ecryptfs
BKL: Remove BKL from afs
BKL: Remove BKL from USB gadgetfs
BKL: Remove BKL from autofs4
BKL: Remove BKL from isofs
BKL: Remove BKL from fat
BKL: Remove BKL from ext2 filesystem
BKL: Remove BKL from do_new_mount()
BKL: Remove BKL from cgroup
BKL: Remove BKL from NTFS
...
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 830058057d33..ad6998a92c30 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/time.h> | 15 | #include <linux/time.h> |
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/smp_lock.h> | ||
18 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
19 | #include <linux/pagemap.h> | 18 | #include <linux/pagemap.h> |
20 | #include <linux/mpage.h> | 19 | #include <linux/mpage.h> |
@@ -489,8 +488,6 @@ static void fat_put_super(struct super_block *sb) | |||
489 | { | 488 | { |
490 | struct msdos_sb_info *sbi = MSDOS_SB(sb); | 489 | struct msdos_sb_info *sbi = MSDOS_SB(sb); |
491 | 490 | ||
492 | lock_kernel(); | ||
493 | |||
494 | if (sb->s_dirt) | 491 | if (sb->s_dirt) |
495 | fat_write_super(sb); | 492 | fat_write_super(sb); |
496 | 493 | ||
@@ -504,8 +501,6 @@ static void fat_put_super(struct super_block *sb) | |||
504 | 501 | ||
505 | sb->s_fs_info = NULL; | 502 | sb->s_fs_info = NULL; |
506 | kfree(sbi); | 503 | kfree(sbi); |
507 | |||
508 | unlock_kernel(); | ||
509 | } | 504 | } |
510 | 505 | ||
511 | static struct kmem_cache *fat_inode_cachep; | 506 | static struct kmem_cache *fat_inode_cachep; |