Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git...

Conflicts:
	include/linux/fs.h

diff --cc fs/super.c
Simple merge

diff --cc include/linux/fs.h
index ce356f66cc2a41de1e452b9f9dc89d8dc0d5bd30,34cfa60db67852fbedd24af2dcbbea124954c73d..9b85aa5c7a701e5704919d286dcd08275f84bf05
--- 1/include/linux/fs.h
--- 2/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
         */