diff options
| author | Linus Torvalds | 2013-09-30 11:11:28 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-09-30 11:11:28 -0700 |
| commit | cbb16bec2d5bc5423f720e6aaed152de9be234ec (patch) | |
| tree | 0bd3a793cef2d1e5da2ab6dc4053d0087a7f1964 /fs/sysv/super.c | |
| parent | 5c282e858f87651e97b31b99e7446aeb449f987e (diff) | |
| parent | 13f3583892cb7afdb2e9eb0207dc4e03ec6f01fd (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull assorted vfs fixes from Al Viro:
"A couple of bug fixes + removal of dead code in afs ->d_revalidate()"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
afs: dget_parent() can't return a negative dentry
ocfs2: needs ->d_lock to poke in ->d_parent->d_inode from ->d_revalidate()
sysv: Add forgotten superblock lock init for v7 fs
Diffstat (limited to 'fs/sysv/super.c')
| -rw-r--r-- | fs/sysv/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/sysv/super.c b/fs/sysv/super.c index d0c6a007ce83..eda10959714f 100644 --- a/fs/sysv/super.c +++ b/fs/sysv/super.c @@ -487,6 +487,7 @@ static int v7_fill_super(struct super_block *sb, void *data, int silent) sbi->s_sb = sb; sbi->s_block_base = 0; sbi->s_type = FSTYPE_V7; + mutex_init(&sbi->s_lock); sb->s_fs_info = sbi; sb_set_blocksize(sb, 512); |