summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2d3b93dd9c2c..140271b1ea2e 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2146,7 +2146,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
2146 * which are indicated by ctx.io_err. 2146 * which are indicated by ctx.io_err.
2147 */ 2147 */
2148 if (ctx.io_err) { 2148 if (ctx.io_err) {
2149 btrfs_end_transaction(trans, root); 2149 btrfs_end_transaction(trans);
2150 ret = ctx.io_err; 2150 ret = ctx.io_err;
2151 goto out; 2151 goto out;
2152 } 2152 }
@@ -2155,20 +2155,20 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
2155 if (!ret) { 2155 if (!ret) {
2156 ret = btrfs_sync_log(trans, root, &ctx); 2156 ret = btrfs_sync_log(trans, root, &ctx);
2157 if (!ret) { 2157 if (!ret) {
2158 ret = btrfs_end_transaction(trans, root); 2158 ret = btrfs_end_transaction(trans);
2159 goto out; 2159 goto out;
2160 } 2160 }
2161 } 2161 }
2162 if (!full_sync) { 2162 if (!full_sync) {
2163 ret = btrfs_wait_ordered_range(inode, start, len); 2163 ret = btrfs_wait_ordered_range(inode, start, len);
2164 if (ret) { 2164 if (ret) {
2165 btrfs_end_transaction(trans, root); 2165 btrfs_end_transaction(trans);
2166 goto out; 2166 goto out;
2167 } 2167 }
2168 } 2168 }
2169 ret = btrfs_commit_transaction(trans, root); 2169 ret = btrfs_commit_transaction(trans);
2170 } else { 2170 } else {
2171 ret = btrfs_end_transaction(trans, root); 2171 ret = btrfs_end_transaction(trans);
2172 } 2172 }
2173out: 2173out:
2174 return ret > 0 ? -EIO : ret; 2174 return ret > 0 ? -EIO : ret;
@@ -2574,7 +2574,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
2574 break; 2574 break;
2575 } 2575 }
2576 2576
2577 btrfs_end_transaction(trans, root); 2577 btrfs_end_transaction(trans);
2578 btrfs_btree_balance_dirty(fs_info); 2578 btrfs_btree_balance_dirty(fs_info);
2579 2579
2580 trans = btrfs_start_transaction(root, rsv_count); 2580 trans = btrfs_start_transaction(root, rsv_count);
@@ -2642,7 +2642,7 @@ out_trans:
2642 trans->block_rsv = &fs_info->trans_block_rsv; 2642 trans->block_rsv = &fs_info->trans_block_rsv;
2643 ret = btrfs_update_inode(trans, root, inode); 2643 ret = btrfs_update_inode(trans, root, inode);
2644 updated_inode = true; 2644 updated_inode = true;
2645 btrfs_end_transaction(trans, root); 2645 btrfs_end_transaction(trans);
2646 btrfs_btree_balance_dirty(fs_info); 2646 btrfs_btree_balance_dirty(fs_info);
2647out_free: 2647out_free:
2648 btrfs_free_path(path); 2648 btrfs_free_path(path);
@@ -2664,7 +2664,7 @@ out_only_mutex:
2664 err = PTR_ERR(trans); 2664 err = PTR_ERR(trans);
2665 } else { 2665 } else {
2666 err = btrfs_update_inode(trans, root, inode); 2666 err = btrfs_update_inode(trans, root, inode);
2667 ret = btrfs_end_transaction(trans, root); 2667 ret = btrfs_end_transaction(trans);
2668 } 2668 }
2669 } 2669 }
2670 inode_unlock(inode); 2670 inode_unlock(inode);
@@ -2906,9 +2906,9 @@ static long btrfs_fallocate(struct file *file, int mode,
2906 btrfs_ordered_update_i_size(inode, actual_end, NULL); 2906 btrfs_ordered_update_i_size(inode, actual_end, NULL);
2907 ret = btrfs_update_inode(trans, root, inode); 2907 ret = btrfs_update_inode(trans, root, inode);
2908 if (ret) 2908 if (ret)
2909 btrfs_end_transaction(trans, root); 2909 btrfs_end_transaction(trans);
2910 else 2910 else
2911 ret = btrfs_end_transaction(trans, root); 2911 ret = btrfs_end_transaction(trans);
2912 } 2912 }
2913 } 2913 }
2914out_unlock: 2914out_unlock: