diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
| commit | 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch) | |
| tree | eaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /fs/xfs/xfs_inode.c | |
| parent | 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 43c632ab86ad..bc8c8c7f9039 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
| @@ -1130,7 +1130,7 @@ xfs_ialloc( | |||
| 1130 | xfs_trans_t *tp, | 1130 | xfs_trans_t *tp, |
| 1131 | xfs_inode_t *pip, | 1131 | xfs_inode_t *pip, |
| 1132 | mode_t mode, | 1132 | mode_t mode, |
| 1133 | nlink_t nlink, | 1133 | xfs_nlink_t nlink, |
| 1134 | xfs_dev_t rdev, | 1134 | xfs_dev_t rdev, |
| 1135 | cred_t *cr, | 1135 | cred_t *cr, |
| 1136 | xfs_prid_t prid, | 1136 | xfs_prid_t prid, |