diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:22:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 17:22:43 -0700 |
| commit | 02ab343f3b497421793cb4c9725587f9052f7078 (patch) | |
| tree | 282180d93a177bb61d22190f72c54bc029302b24 /fs/sysv/super.c | |
| parent | eb3e6ae960562c1b12b3d9c7bc80687e155d78d0 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge 3.12-rc4 into staging-next
We want the staging fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 d0c6a007ce8..eda10959714 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); |