From: Darrick J. Wong Date: Tue, 10 Jan 2017 02:16:33 +0000 (-0600) Subject: libxfs: fix whitespace to match the kernel X-Git-Tag: v4.10.0-rc1~91 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae096c5d8de470cafb05b3f014ef998298e9cba;p=thirdparty%2Fxfsprogs-dev.git libxfs: fix whitespace to match the kernel Fix some minor whitespace errors so that my automated libxfs diff scanning will stop reporting this. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index df599f97f..b75b432f7 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -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. */ diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 172fdfb9a..8628bab19 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -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| \ diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c index 4796a592b..87323597d 100644 --- a/libxfs/xfs_inode_buf.c +++ b/libxfs/xfs_inode_buf.c @@ -537,7 +537,6 @@ xfs_iread( } ASSERT(ip->i_d.di_version >= 2); - ip->i_delayed_blks = 0; /* diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 8212f77fe..2799e2da9 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -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);