From 647f9bca4a35d49f872a18f95e82bf5c59e76506 Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Fri, 1 Mar 2013 13:35:47 -0500
Subject: [PATCH] --- yaml --- r: 360998 b: refs/heads/master c:
 9bf7a4890518186238d2579be16ecc5190a707c0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/btrfs/inode.c    | 6 ++----
 trunk/fs/btrfs/tree-log.c | 5 ++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f48b725cd4ff..4b40c309690c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 154ea2893002618bc3f9a1e2d8186c65490968b1
+refs/heads/master: 9bf7a4890518186238d2579be16ecc5190a707c0
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 13ab4de0a400..ecd9c4cdb0db 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -8502,7 +8502,6 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
 	struct btrfs_key ins;
 	u64 cur_offset = start;
 	u64 i_size;
-	u64 cur_bytes;
 	int ret = 0;
 	bool own_trans = true;
 
@@ -8517,9 +8516,8 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
 			}
 		}
 
-		cur_bytes = min(num_bytes, 256ULL * 1024 * 1024);
-		cur_bytes = max(cur_bytes, min_size);
-		ret = btrfs_reserve_extent(trans, root, cur_bytes,
+		ret = btrfs_reserve_extent(trans, root,
+					   min(num_bytes, 256ULL * 1024 * 1024),
 					   min_size, 0, *alloc_hint, &ins, 1);
 		if (ret) {
 			if (own_trans)
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
index c7ef569eb22a..451fad96ecd1 100644
--- a/trunk/fs/btrfs/tree-log.c
+++ b/trunk/fs/btrfs/tree-log.c
@@ -1382,7 +1382,10 @@ static noinline int link_to_fixup_dir(struct btrfs_trans_handle *trans,
 
 	btrfs_release_path(path);
 	if (ret == 0) {
-		btrfs_inc_nlink(inode);
+		if (!inode->i_nlink)
+			set_nlink(inode, 1);
+		else
+			btrfs_inc_nlink(inode);
 		ret = btrfs_update_inode(trans, root, inode);
 	} else if (ret == -EEXIST) {
 		ret = 0;