diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-08-21 02:31:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-08-21 02:31:20 -0400 |
| commit | 061f98e959ea025a5d87c3e089d59ec2ec5f5d6d (patch) | |
| tree | 4fd1c5d0eb8fd8ee55057dcb2da526d6bbade8d6 /fs/super.c | |
| parent | b5f5914cb8a2745ee4edc9d7f3596d596f1ea1b0 (diff) | |
| parent | ac05fbb40062411ea1b722aa2cede7feaa94f1b4 (diff) | |
| download | linux-rpi-061f98e959ea025a5d87c3e089d59ec2ec5f5d6d.tar.gz linux-rpi-061f98e959ea025a5d87c3e089d59ec2ec5f5d6d.tar.bz2 linux-rpi-061f98e959ea025a5d87c3e089d59ec2ec5f5d6d.zip | |
Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-next
Conflicts:
include/linux/fs.h
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index 767b1e10f6ad..954aeb80e202 100644 --- a/fs/super.c +++ b/fs/super.c @@ -203,7 +203,9 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) s->s_flags = flags; INIT_HLIST_NODE(&s->s_instances); INIT_HLIST_BL_HEAD(&s->s_anon); + mutex_init(&s->s_sync_lock); INIT_LIST_HEAD(&s->s_inodes); + spin_lock_init(&s->s_inode_list_lock); if (list_lru_init_memcg(&s->s_dentry_lru)) goto fail; @@ -412,7 +414,7 @@ void generic_shutdown_super(struct super_block *sb) sync_filesystem(sb); sb->s_flags &= ~MS_ACTIVE; - fsnotify_unmount_inodes(&sb->s_inodes); + fsnotify_unmount_inodes(sb); evict_inodes(sb); |