From: Anand Jain <anand.jain@oracle.com>
Date: Wed, 21 Dec 2016 07:42:08 +0000 (+0800)
Subject: btrfs: btrfs_defrag_root() doesn't defrag extent root tree
X-Git-Tag: v4.11-rc1~69^2~114
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c3e6b1f0cd1765d6aeeaa9cdb69b39cea0b6804;p=karo-tx-linux.git

btrfs: btrfs_defrag_root() doesn't defrag extent root tree

Since btrfs_defrag_leaves() does not support extent_root, remove its
corresponding call. The user can use the file based defrag to defrag
extents as of now.

No change in behaviour as extent_root is explicitly skipped in
btrfs_defrag_leaves and this has never worked as expected.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ ehnance changelong ]
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 03de93f9a6aa..fe8b585ea13b 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2613,9 +2613,6 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 			goto out;
 		}
 		ret = btrfs_defrag_root(root);
-		if (ret)
-			goto out;
-		ret = btrfs_defrag_root(root->fs_info->extent_root);
 		break;
 	case S_IFREG:
 		if (!(file->f_mode & FMODE_WRITE)) {