diff options
| author | Dave Chinner | 2016-03-06 23:30:32 +0100 |
|---|---|---|
| committer | Dave Chinner | 2016-03-06 23:30:32 +0100 |
| commit | a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f (patch) | |
| tree | 892f8d40b2267422d2d38a62acace8ed613f71a8 /fs/xfs/xfs_inode.h | |
| parent | Merge branch 'xfs-misc-fixes-4.6' into for-next (diff) | |
| parent | xfs: mode di_mode to vfs inode (diff) | |
| download | kernel-qcow2-linux-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.tar.gz kernel-qcow2-linux-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.tar.xz kernel-qcow2-linux-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.zip | |
Merge branch 'xfs-gut-icdinode-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_inode.h')
| -rw-r--r-- | fs/xfs/xfs_inode.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index ed7e9339c7e9..43e1d51b15eb 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -63,7 +63,7 @@ typedef struct xfs_inode { unsigned long i_flags; /* see defined flags below */ unsigned int i_delayed_blks; /* count of delay alloc blks */ - xfs_icdinode_t i_d; /* most of ondisk inode */ + struct xfs_icdinode i_d; /* most of ondisk inode */ /* VFS inode */ struct inode i_vnode; /* embedded VFS inode */ @@ -88,7 +88,7 @@ static inline struct inode *VFS_I(struct xfs_inode *ip) */ static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip) { - if (S_ISREG(ip->i_d.di_mode)) + if (S_ISREG(VFS_I(ip)->i_mode)) return i_size_read(VFS_I(ip)); return ip->i_d.di_size; } @@ -369,7 +369,7 @@ static inline int xfs_isiflocked(struct xfs_inode *ip) */ #define XFS_INHERIT_GID(pip) \ (((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \ - ((pip)->i_d.di_mode & S_ISGID)) + (VFS_I(pip)->i_mode & S_ISGID)) int xfs_release(struct xfs_inode *ip); void xfs_inactive(struct xfs_inode *ip); @@ -405,8 +405,6 @@ int xfs_ifree(struct xfs_trans *, xfs_inode_t *, struct xfs_bmap_free *); int xfs_itruncate_extents(struct xfs_trans **, struct xfs_inode *, int, xfs_fsize_t); -int xfs_iunlink(struct xfs_trans *, xfs_inode_t *); - void xfs_iext_realloc(xfs_inode_t *, int, int); void xfs_iunpin_wait(xfs_inode_t *); |