diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-05-05 15:40:36 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-12 03:36:07 +0200 |
| commit | 6cfd0148425e528b859b26e436b01f23f6926224 (patch) | |
| tree | 60e3257053554ff198fe5825e6f12a00c3b4422a /fs/isofs/inode.c | |
| parent | No need to do lock_super() for exclusion in generic_shutdown_super() (diff) | |
| download | linux-6cfd0148425e528b859b26e436b01f23f6926224.tar.xz linux-6cfd0148425e528b859b26e436b01f23f6926224.zip | |
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/isofs/inode.c')
| -rw-r--r-- | fs/isofs/inode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index b4cbe9603c7d..068b34b5a107 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -42,11 +42,16 @@ static int isofs_dentry_cmp_ms(struct dentry *dentry, struct qstr *a, struct qst static void isofs_put_super(struct super_block *sb) { struct isofs_sb_info *sbi = ISOFS_SB(sb); + #ifdef CONFIG_JOLIET + lock_kernel(); + if (sbi->s_nls_iocharset) { unload_nls(sbi->s_nls_iocharset); sbi->s_nls_iocharset = NULL; } + + unlock_kernel(); #endif kfree(sbi); |