diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2016-12-22 17:13:54 -0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-01-03 17:29:50 +0100 |
| commit | c2931667c83ded6504b3857e99cc45b21fa496fb (patch) | |
| tree | e427359939b7ae3c7ef9eda9839ca3ccd0739b98 /fs | |
| parent | 781feef7e6befafd4d9787d1f7ada1f9ccd504e4 (diff) | |
| download | op-kernel-dev-c2931667c83ded6504b3857e99cc45b21fa496fb.zip op-kernel-dev-c2931667c83ded6504b3857e99cc45b21fa496fb.tar.gz | |
Btrfs: adjust outstanding_extents counter properly when dio write is split
Currently how btrfs dio deals with split dio write is not good
enough if dio write is split into several segments due to the
lack of contiguous space, a large dio write like 'dd bs=1G count=1'
can end up with incorrect outstanding_extents counter and endio
would complain loudly with an assertion.
This fixes the problem by compensating the outstanding_extents
counter in inode if a large dio write gets split.
Reported-by: Anand Jain <anand.jain@oracle.com>
Tested-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index a713d9d..81b9d9d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7623,11 +7623,18 @@ static void adjust_dio_outstanding_extents(struct inode *inode, * within our reservation, otherwise we need to adjust our inode * counter appropriately. */ - if (dio_data->outstanding_extents) { + if (dio_data->outstanding_extents >= num_extents) { dio_data->outstanding_extents -= num_extents; } else { + /* + * If dio write length has been split due to no large enough + * contiguous space, we need to compensate our inode counter + * appropriately. + */ + u64 num_needed = num_extents - dio_data->outstanding_extents; + spin_lock(&BTRFS_I(inode)->lock); - BTRFS_I(inode)->outstanding_extents += num_extents; + BTRFS_I(inode)->outstanding_extents += num_needed; spin_unlock(&BTRFS_I(inode)->lock); } } |
