From ba84089fdc7fe6b4fef37aa8fcd8e8e038a21c80 Mon Sep 17 00:00:00 2001
From: Wanlong Gao <wanlong.gao@gmail.com>
Date: Mon, 18 Jul 2011 12:19:35 +0000
Subject: [PATCH] --- yaml --- r: 262231 b: refs/heads/master c:
 a0f98dde11a1afe9fbf5c98f57968e086e98b6f5 h: refs/heads/master i:   262229:
 0ea64888d1d50009f260576bac887939e9397d3e   262227:
 6ca17177ce46d6ea7bc4c4e95bf6eaf2bd5a41bd   262223:
 6c2068a80c212796c40b1f5c74c2ce02cfaffba7 v: v3

---
 [refs]                |  2 +-
 trunk/fs/btrfs/file.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index eed8e5889191..68101a28fc31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43b31bdf2e662006c27cc4dcccf863312d62bc1
+refs/heads/master: a0f98dde11a1afe9fbf5c98f57968e086e98b6f5
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index 41ca5fdaee6c..7f134a730efb 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/fs/btrfs/file.c
@@ -74,7 +74,7 @@ struct inode_defrag {
  * If an existing record is found the defrag item you
  * pass in is freed
  */
-static int __btrfs_add_inode_defrag(struct inode *inode,
+static void __btrfs_add_inode_defrag(struct inode *inode,
 				    struct inode_defrag *defrag)
 {
 	struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -106,11 +106,11 @@ static int __btrfs_add_inode_defrag(struct inode *inode,
 	BTRFS_I(inode)->in_defrag = 1;
 	rb_link_node(&defrag->rb_node, parent, p);
 	rb_insert_color(&defrag->rb_node, &root->fs_info->defrag_inodes);
-	return 0;
+	return;
 
 exists:
 	kfree(defrag);
-	return 0;
+	return;
 
 }
 
@@ -123,7 +123,6 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
 {
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct inode_defrag *defrag;
-	int ret = 0;
 	u64 transid;
 
 	if (!btrfs_test_opt(root, AUTO_DEFRAG))
@@ -150,9 +149,9 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
 
 	spin_lock(&root->fs_info->defrag_inodes_lock);
 	if (!BTRFS_I(inode)->in_defrag)
-		ret = __btrfs_add_inode_defrag(inode, defrag);
+		__btrfs_add_inode_defrag(inode, defrag);
 	spin_unlock(&root->fs_info->defrag_inodes_lock);
-	return ret;
+	return 0;
 }
 
 /*