diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
| commit | 975439fe73d1f0f7ce8c235c66783bd34dc459c3 (patch) | |
| tree | 84e29852d96283b13c6e603f86bd506a631343c5 /fs/xfs/xfs_utils.h | |
| parent | ef31023743e66de7184e9aad432291c842a6384b (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
Merge branch 'x86/amd-iommu' into x86/urgent
Diffstat (limited to 'fs/xfs/xfs_utils.h')
| -rw-r--r-- | fs/xfs/xfs_utils.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/xfs/xfs_utils.h b/fs/xfs/xfs_utils.h index f316cb85d8e2..ef321225d269 100644 --- a/fs/xfs/xfs_utils.h +++ b/fs/xfs/xfs_utils.h | |||
| @@ -18,9 +18,6 @@ | |||
| 18 | #ifndef __XFS_UTILS_H__ | 18 | #ifndef __XFS_UTILS_H__ |
| 19 | #define __XFS_UTILS_H__ | 19 | #define __XFS_UTILS_H__ |
| 20 | 20 | ||
| 21 | #define IRELE(ip) VN_RELE(XFS_ITOV(ip)) | ||
| 22 | #define IHOLD(ip) VN_HOLD(XFS_ITOV(ip)) | ||
| 23 | |||
| 24 | extern int xfs_truncate_file(xfs_mount_t *, xfs_inode_t *); | 21 | extern int xfs_truncate_file(xfs_mount_t *, xfs_inode_t *); |
| 25 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, | 22 | extern int xfs_dir_ialloc(xfs_trans_t **, xfs_inode_t *, mode_t, xfs_nlink_t, |
| 26 | xfs_dev_t, cred_t *, prid_t, int, | 23 | xfs_dev_t, cred_t *, prid_t, int, |