diff options
| author | Dave Chinner <dchinner@redhat.com> | 2016-02-09 16:54:58 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-02-09 16:54:58 +1100 |
| commit | c19b3b05ae440de50fffe2ac2a9b27392a7448e9 (patch) | |
| tree | c18e6272503b92cf5397aa25cfe19542c2b45149 /fs/xfs/xfs_bmap_util.c | |
| parent | 83e06f21b439b7b308eda06332a4feef35739e94 (diff) | |
| download | op-kernel-dev-c19b3b05ae440de50fffe2ac2a9b27392a7448e9.zip op-kernel-dev-c19b3b05ae440de50fffe2ac2a9b27392a7448e9.tar.gz | |
xfs: mode di_mode to vfs inode
Move the di_mode value from the xfs_icdinode to the VFS inode, reducing
the xfs_icdinode byte another 2 bytes and collapsing another 2 byte hole
in the structure.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_bmap_util.c')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 45ec9e4..7087756 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -821,7 +821,7 @@ bool xfs_can_free_eofblocks(struct xfs_inode *ip, bool force) { /* prealloc/delalloc exists only on regular files */ - if (!S_ISREG(ip->i_d.di_mode)) + if (!S_ISREG(VFS_I(ip)->i_mode)) return false; /* @@ -1726,7 +1726,7 @@ xfs_swap_extents( xfs_lock_two_inodes(ip, tip, XFS_MMAPLOCK_EXCL); /* Verify that both files have the same format */ - if ((ip->i_d.di_mode & S_IFMT) != (tip->i_d.di_mode & S_IFMT)) { + if ((VFS_I(ip)->i_mode & S_IFMT) != (VFS_I(tip)->i_mode & S_IFMT)) { error = -EINVAL; goto out_unlock; } |
