Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / fs / adfs / adfs.h

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 585adafb0cc270f9e0b023b2543e1151fa83e3b4..c770337c4b458beefc707a91fb8c9f7315d0634b 100644 (file)
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -43,9 +43,12 @@ struct adfs_dir_ops;
  * ADFS file system superblock data in memory
  */
 struct adfs_sb_info {
-       struct adfs_discmap *s_map;     /* bh list containing map                */
-       struct adfs_dir_ops *s_dir;     /* directory operations                  */
-
+       union { struct {
+               struct adfs_discmap *s_map;     /* bh list containing map        */
+               struct adfs_dir_ops *s_dir;     /* directory operations          */
+               };
+               struct rcu_head rcu;            /* used only at shutdown time    */
+       };
        kuid_t          s_uid;          /* owner uid                             */
        kgid_t          s_gid;          /* owner gid                             */
        umode_t         s_owner_mask;   /* ADFS owner perm -> unix perm          */