diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:32 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:32 +1100 |
| commit | a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f (patch) | |
| tree | 892f8d40b2267422d2d38a62acace8ed613f71a8 /fs/xfs/xfs_bmap_util.c | |
| parent | 6d247d47fbd6883f7096e0e672afbdba6286dbc4 (diff) | |
| parent | c19b3b05ae440de50fffe2ac2a9b27392a7448e9 (diff) | |
| download | op-kernel-dev-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.zip op-kernel-dev-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.tar.gz | |
Merge branch 'xfs-gut-icdinode-4.6' into for-next
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 07ef29b..fd7f51c 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -823,7 +823,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; /* @@ -1728,7 +1728,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; } |
