aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-05-05 09:40:36 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-11 21:36:07 -0400
commit6cfd0148425e528b859b26e436b01f23f6926224 (patch)
tree60e3257053554ff198fe5825e6f12a00c3b4422a /fs/ubifs
parenta9e220f8322e2b0e0b8903fe00265461cffad3f0 (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/ubifs')
-rw-r--r--fs/ubifs/super.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 84f3c7fd1552..522c3fd7eb3c 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1684,6 +1684,9 @@ static void ubifs_put_super(struct super_block *sb)
1684 1684
1685 ubifs_msg("un-mount UBI device %d, volume %d", c->vi.ubi_num, 1685 ubifs_msg("un-mount UBI device %d, volume %d", c->vi.ubi_num,
1686 c->vi.vol_id); 1686 c->vi.vol_id);
1687
1688 lock_kernel();
1689
1687 /* 1690 /*
1688 * The following asserts are only valid if there has not been a failure 1691 * The following asserts are only valid if there has not been a failure
1689 * of the media. For example, there will be dirty inodes if we failed 1692 * of the media. For example, there will be dirty inodes if we failed
@@ -1750,6 +1753,8 @@ static void ubifs_put_super(struct super_block *sb)
1750 ubi_close_volume(c->ubi); 1753 ubi_close_volume(c->ubi);
1751 mutex_unlock(&c->umount_mutex); 1754 mutex_unlock(&c->umount_mutex);
1752 kfree(c); 1755 kfree(c);
1756
1757 unlock_kernel();
1753} 1758}
1754 1759
1755static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data) 1760static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)