diff options
Diffstat (limited to 'fs/xfs/xfs_inode.h')
-rw-r--r-- | fs/xfs/xfs_inode.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index ca9e11989cbd..43e1d51b15eb 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
@@ -63,7 +63,7 @@ typedef struct xfs_inode { | |||
63 | unsigned long i_flags; /* see defined flags below */ | 63 | unsigned long i_flags; /* see defined flags below */ |
64 | unsigned int i_delayed_blks; /* count of delay alloc blks */ | 64 | unsigned int i_delayed_blks; /* count of delay alloc blks */ |
65 | 65 | ||
66 | xfs_icdinode_t i_d; /* most of ondisk inode */ | 66 | struct xfs_icdinode i_d; /* most of ondisk inode */ |
67 | 67 | ||
68 | /* VFS inode */ | 68 | /* VFS inode */ |
69 | struct inode i_vnode; /* embedded VFS inode */ | 69 | struct inode i_vnode; /* embedded VFS inode */ |
@@ -88,7 +88,7 @@ static inline struct inode *VFS_I(struct xfs_inode *ip) | |||
88 | */ | 88 | */ |
89 | static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip) | 89 | static inline xfs_fsize_t XFS_ISIZE(struct xfs_inode *ip) |
90 | { | 90 | { |
91 | if (S_ISREG(ip->i_d.di_mode)) | 91 | if (S_ISREG(VFS_I(ip)->i_mode)) |
92 | return i_size_read(VFS_I(ip)); | 92 | return i_size_read(VFS_I(ip)); |
93 | return ip->i_d.di_size; | 93 | return ip->i_d.di_size; |
94 | } | 94 | } |
@@ -369,7 +369,7 @@ static inline int xfs_isiflocked(struct xfs_inode *ip) | |||
369 | */ | 369 | */ |
370 | #define XFS_INHERIT_GID(pip) \ | 370 | #define XFS_INHERIT_GID(pip) \ |
371 | (((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \ | 371 | (((pip)->i_mount->m_flags & XFS_MOUNT_GRPID) || \ |
372 | ((pip)->i_d.di_mode & S_ISGID)) | 372 | (VFS_I(pip)->i_mode & S_ISGID)) |
373 | 373 | ||
374 | int xfs_release(struct xfs_inode *ip); | 374 | int xfs_release(struct xfs_inode *ip); |
375 | void xfs_inactive(struct xfs_inode *ip); | 375 | void xfs_inactive(struct xfs_inode *ip); |
@@ -405,8 +405,6 @@ int xfs_ifree(struct xfs_trans *, xfs_inode_t *, | |||
405 | struct xfs_bmap_free *); | 405 | struct xfs_bmap_free *); |
406 | int xfs_itruncate_extents(struct xfs_trans **, struct xfs_inode *, | 406 | int xfs_itruncate_extents(struct xfs_trans **, struct xfs_inode *, |
407 | int, xfs_fsize_t); | 407 | int, xfs_fsize_t); |
408 | int xfs_iunlink(struct xfs_trans *, xfs_inode_t *); | ||
409 | |||
410 | void xfs_iext_realloc(xfs_inode_t *, int, int); | 408 | void xfs_iext_realloc(xfs_inode_t *, int, int); |
411 | 409 | ||
412 | void xfs_iunpin_wait(xfs_inode_t *); | 410 | void xfs_iunpin_wait(xfs_inode_t *); |
@@ -437,6 +435,8 @@ int xfs_update_prealloc_flags(struct xfs_inode *ip, | |||
437 | int xfs_zero_eof(struct xfs_inode *ip, xfs_off_t offset, | 435 | int xfs_zero_eof(struct xfs_inode *ip, xfs_off_t offset, |
438 | xfs_fsize_t isize, bool *did_zeroing); | 436 | xfs_fsize_t isize, bool *did_zeroing); |
439 | int xfs_iozero(struct xfs_inode *ip, loff_t pos, size_t count); | 437 | int xfs_iozero(struct xfs_inode *ip, loff_t pos, size_t count); |
438 | loff_t __xfs_seek_hole_data(struct inode *inode, loff_t start, | ||
439 | loff_t eof, int whence); | ||
440 | 440 | ||
441 | 441 | ||
442 | /* from xfs_iops.c */ | 442 | /* from xfs_iops.c */ |