OSDN Git Service

Btrfs: fill_holes: Fix slot number passed to hole_mergeable() call.
authorchandan <chandan@linux.vnet.ibm.com>
Tue, 1 Jul 2014 06:34:28 +0000 (12:04 +0530)
committerChris Mason <clm@fb.com>
Tue, 19 Aug 2014 15:36:26 +0000 (08:36 -0700)
commit1707e26d6ab05c477a91d260e31fda7c6c38588e
tree3ff2df1816f2f086130f803157a598e40c76ddb8
parent7a5c3c9be1059feed0e470c6dc0994dcaed4f12c
Btrfs: fill_holes: Fix slot number passed to hole_mergeable() call.

For a non-existent key, btrfs_search_slot() sets path->slots[0] to the slot
where the key could have been present, which in this case would be the slot
containing the extent item which would be the next neighbor of the file range
being punched. The current code passes an incremented path->slots[0] and we
skip to the wrong file extent item. This would mean that we would fail to
merge the "yet to be created" hole with the next neighboring hole (if one
exists). Fix this.

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reviewed-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/file.c