diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/xfs/xfs_dir2_data.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/xfs/xfs_dir2_data.c')
| -rw-r--r-- | fs/xfs/xfs_dir2_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dir2_data.c b/fs/xfs/xfs_dir2_data.c index d2452699e9b1..fb8c9e08b23d 100644 --- a/fs/xfs/xfs_dir2_data.c +++ b/fs/xfs/xfs_dir2_data.c | |||
| @@ -587,7 +587,7 @@ xfs_dir2_data_make_free( | |||
| 587 | /* | 587 | /* |
| 588 | * Fix up the new big freespace. | 588 | * Fix up the new big freespace. |
| 589 | */ | 589 | */ |
| 590 | be16_add(&prevdup->length, len + be16_to_cpu(postdup->length)); | 590 | be16_add_cpu(&prevdup->length, len + be16_to_cpu(postdup->length)); |
| 591 | *xfs_dir2_data_unused_tag_p(prevdup) = | 591 | *xfs_dir2_data_unused_tag_p(prevdup) = |
| 592 | cpu_to_be16((char *)prevdup - (char *)d); | 592 | cpu_to_be16((char *)prevdup - (char *)d); |
| 593 | xfs_dir2_data_log_unused(tp, bp, prevdup); | 593 | xfs_dir2_data_log_unused(tp, bp, prevdup); |
| @@ -621,7 +621,7 @@ xfs_dir2_data_make_free( | |||
| 621 | */ | 621 | */ |
| 622 | else if (prevdup) { | 622 | else if (prevdup) { |
| 623 | dfp = xfs_dir2_data_freefind(d, prevdup); | 623 | dfp = xfs_dir2_data_freefind(d, prevdup); |
| 624 | be16_add(&prevdup->length, len); | 624 | be16_add_cpu(&prevdup->length, len); |
| 625 | *xfs_dir2_data_unused_tag_p(prevdup) = | 625 | *xfs_dir2_data_unused_tag_p(prevdup) = |
| 626 | cpu_to_be16((char *)prevdup - (char *)d); | 626 | cpu_to_be16((char *)prevdup - (char *)d); |
| 627 | xfs_dir2_data_log_unused(tp, bp, prevdup); | 627 | xfs_dir2_data_log_unused(tp, bp, prevdup); |