@@ -2146,12 +2146,14 @@ xfs_dir2_node_replace(
state = xfs_da_state_alloc();
state->args = args;
state->mp = args->dp->i_mount;
+
/*
* We have to save new inode number and ftype since
* xfs_da3_node_lookup_int() is going to overwrite them
*/
inum = args->inumber;
ftype = args->filetype;
+
/*
* Lookup the entry to change in the btree.
*/
@@ -473,7 +473,6 @@ xfs_sb_has_ro_compat_feature(
#define XFS_SB_FEAT_INCOMPAT_FTYPE (1 << 0) /* filetype in dirent */
#define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */
#define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */
-
#define XFS_SB_FEAT_INCOMPAT_ALL \
(XFS_SB_FEAT_INCOMPAT_FTYPE| \
XFS_SB_FEAT_INCOMPAT_SPINODES| \
@@ -537,7 +537,6 @@ xfs_iread(
}
ASSERT(ip->i_d.di_version >= 2);
-
ip->i_delayed_blks = 0;
/*
@@ -29,6 +29,7 @@
#include "xfs_attr_sf.h"
#include "xfs_da_format.h"
+
kmem_zone_t *xfs_ifork_zone;
STATIC int xfs_iformat_local(xfs_inode_t *, xfs_dinode_t *, int, int);
Fix some minor whitespace errors so that my automated libxfs diff scanning will stop reporting this. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- libxfs/xfs_dir2_node.c | 2 ++ libxfs/xfs_format.h | 1 - libxfs/xfs_inode_buf.c | 1 - libxfs/xfs_inode_fork.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html