From: Josef Bacik <jbacik@fb.com>
Date: Wed, 11 Feb 2015 20:08:58 +0000 (-0500)
Subject: Btrfs: don't set and clear delalloc for O_DIRECT writes
X-Git-Tag: firefly_0821_release~176^2~2126^2~26
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3266789f9d08b27275bae5ab1dcd27d1bbf15e79;p=firefly-linux-kernel-4.4.55.git

Btrfs: don't set and clear delalloc for O_DIRECT writes

We do this to get the space accounting, but this is just needless churn on the
io_tree, so just drop setting/clearing delalloc and just drop the reserved data
space when we have a successfull allocation.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5a5b902e647f..3b957921ba59 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7160,7 +7160,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock,
 	int ret = 0;
 
 	if (create)
-		unlock_bits |= EXTENT_DELALLOC | EXTENT_DIRTY;
+		unlock_bits |= EXTENT_DIRTY;
 	else
 		len = min_t(u64, len, root->sectorsize);
 
@@ -7296,11 +7296,7 @@ unlock:
 			BTRFS_I(inode)->outstanding_extents++;
 			spin_unlock(&BTRFS_I(inode)->lock);
 		}
-
-		ret = set_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,
-				     lockstart + len - 1, EXTENT_DELALLOC, NULL,
-				     &cached_state, GFP_NOFS);
-		BUG_ON(ret);
+		btrfs_free_reserved_data_space(inode, len);
 	}
 
 	/*