diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/xfs/xfs_dfrag.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/xfs/xfs_dfrag.c')
| -rw-r--r-- | fs/xfs/xfs_dfrag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index 3f53fad356a3..5f3647cb9885 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -162,7 +162,7 @@ xfs_swap_extents( | |||
| 162 | ips[1] = ip; | 162 | ips[1] = ip; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | xfs_lock_inodes(ips, 2, 0, lock_flags); | 165 | xfs_lock_inodes(ips, 2, lock_flags); |
| 166 | locked = 1; | 166 | locked = 1; |
| 167 | 167 | ||
| 168 | /* Verify that both files have the same format */ | 168 | /* Verify that both files have the same format */ |
| @@ -265,7 +265,7 @@ xfs_swap_extents( | |||
| 265 | locked = 0; | 265 | locked = 0; |
| 266 | goto error0; | 266 | goto error0; |
| 267 | } | 267 | } |
| 268 | xfs_lock_inodes(ips, 2, 0, XFS_ILOCK_EXCL); | 268 | xfs_lock_inodes(ips, 2, XFS_ILOCK_EXCL); |
| 269 | 269 | ||
| 270 | /* | 270 | /* |
| 271 | * Count the number of extended attribute blocks | 271 | * Count the number of extended attribute blocks |