diff options
| author | Jan Kara | 2011-07-21 22:22:25 +0200 |
|---|---|---|
| committer | Al Viro | 2011-07-23 01:42:12 +0200 |
| commit | d769b3c2ab7184ddd42056595b627cc871caa90e (patch) | |
| tree | b030270648c2a2aca7c5417e2ae0436ec7d0a31c /fs/isofs/rock.c | |
| parent | jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory (diff) | |
| download | kernel-qcow2-linux-d769b3c2ab7184ddd42056595b627cc871caa90e.tar.gz kernel-qcow2-linux-d769b3c2ab7184ddd42056595b627cc871caa90e.tar.xz kernel-qcow2-linux-d769b3c2ab7184ddd42056595b627cc871caa90e.zip | |
isofs: Remove global fs lock
sbi->s_mutex isn't needed for isofs at all so we can just remove it. Generally,
since isofs is always mounted read-only, filesystem structure cannot change
under us. So buffer_head contents stays constant after it's filled in. That
leaves us with possible changes of global data structures. Superblock changes
only during filesystem mount (even remount does not change it), inodes are only
filled in during reading from disk. So there are no changes of these structures
to bother about.
Arguments why sbi->s_mutex can be removed at each place:
isofs_readdir: Accesses sb, inode, filp, local variables => s_mutex not needed
isofs_lookup: Protected by directory's i_mutex. Accesses sb, inode, dentry,
local variables => s_mutex not needed
rock_ridge_symlink_readpage: Protected by page lock. Accesses sb, inode,
local variables => s_mutex not needed.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/isofs/rock.c')
| -rw-r--r-- | fs/isofs/rock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index f9cd04db6eab..1fbc7de88f50 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -678,7 +678,6 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page) init_rock_state(&rs, inode); block = ei->i_iget5_block; - mutex_lock(&sbi->s_mutex); bh = sb_bread(inode->i_sb, block); if (!bh) goto out_noread; @@ -748,7 +747,6 @@ repeat: goto fail; brelse(bh); *rpnt = '\0'; - mutex_unlock(&sbi->s_mutex); SetPageUptodate(page); kunmap(page); unlock_page(page); @@ -765,7 +763,6 @@ out_bad_span: printk("symlink spans iso9660 blocks\n"); fail: brelse(bh); - mutex_unlock(&sbi->s_mutex); error: SetPageError(page); kunmap(page); |