diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 17:00:02 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-21 17:00:02 -0400 |
commit | 67394f8f069c2fdf90f3b6d851824c07815442af (patch) | |
tree | 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7 /fs/xfs/xfs_inode.h | |
parent | 450cbfbbbd88876e3ccec1d277f613221ca82bb7 (diff) | |
parent | 9636273dae265b9354b861b373cd43cd76a6d0fe (diff) |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs/xfs/xfs_inode.h')
-rw-r--r-- | fs/xfs/xfs_inode.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index a53b1ccf6070..37e1c316f3b6 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
@@ -495,9 +495,9 @@ int xfs_itobp(struct xfs_mount *, struct xfs_trans *, | |||
495 | int xfs_iread(struct xfs_mount *, struct xfs_trans *, xfs_ino_t, | 495 | int xfs_iread(struct xfs_mount *, struct xfs_trans *, xfs_ino_t, |
496 | xfs_inode_t **, xfs_daddr_t); | 496 | xfs_inode_t **, xfs_daddr_t); |
497 | int xfs_iread_extents(struct xfs_trans *, xfs_inode_t *, int); | 497 | int xfs_iread_extents(struct xfs_trans *, xfs_inode_t *, int); |
498 | int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, nlink_t, | 498 | int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, mode_t, |
499 | xfs_dev_t, struct cred *, xfs_prid_t, int, | 499 | xfs_nlink_t, xfs_dev_t, struct cred *, xfs_prid_t, |
500 | struct xfs_buf **, boolean_t *, xfs_inode_t **); | 500 | int, struct xfs_buf **, boolean_t *, xfs_inode_t **); |
501 | void xfs_xlate_dinode_core(xfs_caddr_t, struct xfs_dinode_core *, | 501 | void xfs_xlate_dinode_core(xfs_caddr_t, struct xfs_dinode_core *, |
502 | int); | 502 | int); |
503 | uint xfs_ip2xflags(struct xfs_inode *); | 503 | uint xfs_ip2xflags(struct xfs_inode *); |