This is running in a typical write path, not inside a critical path
where we have to abort the running transaction, so it's OK to return
errors to callers and eventually to userspace.

Signed-off-by: Liu Bo <bo....@linux.alibaba.com>
---
 fs/btrfs/inode.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c7b75dd..b9310f8 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4939,16 +4939,13 @@ static int maybe_insert_hole(struct btrfs_root *root, 
struct inode *inode,
 
        ret = btrfs_drop_extents(trans, root, inode, offset, offset + len, 1);
        if (ret) {
-               btrfs_abort_transaction(trans, ret);
                btrfs_end_transaction(trans);
                return ret;
        }
 
        ret = btrfs_insert_file_extent(trans, root, btrfs_ino(BTRFS_I(inode)),
                        offset, 0, 0, len, 0, len, 0, 0, 0);
-       if (ret)
-               btrfs_abort_transaction(trans, ret);
-       else
+       if (!ret)
                btrfs_update_inode(trans, root, inode);
        btrfs_end_transaction(trans);
        return ret;
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to