diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:29 +0100 |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /fs/xfs/xfs_dfrag.c | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
| download | kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.zip kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.tar.gz kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.tar.bz2 | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/xfs/xfs_dfrag.c')
| -rw-r--r-- | fs/xfs/xfs_dfrag.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index 3b9582c..e60490b 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c @@ -377,6 +377,19 @@ xfs_swap_extents( ip->i_d.di_format = tip->i_d.di_format; tip->i_d.di_format = tmp; + /* + * The extents in the source inode could still contain speculative + * preallocation beyond EOF (e.g. the file is open but not modified + * while defrag is in progress). In that case, we need to copy over the + * number of delalloc blocks the data fork in the source inode is + * tracking beyond EOF so that when the fork is truncated away when the + * temporary inode is unlinked we don't underrun the i_delayed_blks + * counter on that inode. + */ + ASSERT(tip->i_delayed_blks == 0); + tip->i_delayed_blks = ip->i_delayed_blks; + ip->i_delayed_blks = 0; + ilf_fields = XFS_ILOG_CORE; switch(ip->i_d.di_format) { |