diff --git a/[refs] b/[refs]
index 06c2f73c23a7..15a8c0e07f7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97c2916e25c56e878e3e94efd449e2d688fcb31
+refs/heads/master: f4ac904c411b55e58bb240f332f93db2455f0010
diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
index 010aec8be824..0705d15542c6 100644
--- a/trunk/fs/btrfs/file.c
+++ b/trunk/fs/btrfs/file.c
@@ -150,6 +150,8 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
 	spin_lock(&root->fs_info->defrag_inodes_lock);
 	if (!BTRFS_I(inode)->in_defrag)
 		__btrfs_add_inode_defrag(inode, defrag);
+	else
+		kfree(defrag);
 	spin_unlock(&root->fs_info->defrag_inodes_lock);
 	return 0;
 }