From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 21 Aug 2015 06:31:20 +0000 (-0400)
Subject: Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=061f98e959ea025a5d87c3e089d59ec2ec5f5d6d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'superblock-scaling' of git://git./linux/kernel/git/josef/btrfs-next into for-next

Conflicts:
	include/linux/fs.h
---

061f98e959ea025a5d87c3e089d59ec2ec5f5d6d
diff --cc include/linux/fs.h
index ce356f66cc2a,34cfa60db678..9b85aa5c7a70
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -1369,7 -1374,9 +1368,10 @@@ struct super_block 
  	struct list_lru		s_dentry_lru ____cacheline_aligned_in_smp;
  	struct list_lru		s_inode_lru ____cacheline_aligned_in_smp;
  	struct rcu_head		rcu;
 +	struct work_struct	destroy_work;
+ 
+ 	struct mutex		s_sync_lock;	/* sync serialisation lock */
+ 
  	/*
  	 * Indicates how deep in a filesystem stack this SB is
  	 */