rcu: Check both root and current rcu_node when setting up future grace period

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_fsops.c

diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 3445ead7c1fcfb63611d018ec38cb78a68ae1fcf..d2295561570af03ffc5971dcf7cf67630cd4f6e5 100644 (file)
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -24,6 +24,8 @@
 #include "xfs_sb.h"
 #include "xfs_ag.h"
 #include "xfs_mount.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 #include "xfs_inode_item.h"
@@ -74,23 +76,18 @@ xfs_fs_geometry(
        }
        if (new_version >= 3) {
                geo->version = XFS_FSOP_GEOM_VERSION;
-               geo->flags =
+               geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK |
+                            XFS_FSOP_GEOM_FLAGS_DIRV2 |
                        (xfs_sb_version_hasattr(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_ATTR : 0) |
-                       (xfs_sb_version_hasnlink(&mp->m_sb) ?
-                               XFS_FSOP_GEOM_FLAGS_NLINK : 0) |
                        (xfs_sb_version_hasquota(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_QUOTA : 0) |
                        (xfs_sb_version_hasalign(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_IALIGN : 0) |
                        (xfs_sb_version_hasdalign(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_DALIGN : 0) |
-                       (xfs_sb_version_hasshared(&mp->m_sb) ?
-                               XFS_FSOP_GEOM_FLAGS_SHARED : 0) |
                        (xfs_sb_version_hasextflgbit(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) |
-                       (xfs_sb_version_hasdirv2(&mp->m_sb) ?
-                               XFS_FSOP_GEOM_FLAGS_DIRV2 : 0) |
                        (xfs_sb_version_hassector(&mp->m_sb) ?
                                XFS_FSOP_GEOM_FLAGS_SECTOR : 0) |
                        (xfs_sb_version_hasasciici(&mp->m_sb) ?
@@ -110,7 +107,7 @@ xfs_fs_geometry(
                geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?
                                mp->m_sb.sb_logsectsize : BBSIZE;
                geo->rtsectsize = mp->m_sb.sb_blocksize;
-               geo->dirblocksize = mp->m_dirblksize;
+               geo->dirblocksize = mp->m_dir_geo->blksize;
        }
        if (new_version >= 4) {
                geo->flags |=