[PATCH 1/2] btrfs: btrfs_defrag_root() doesn't support any option

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Both BTRFS_IOC_DEFRAG and BTRFS_IOC_DEFRAG_RANGE call the same
function- btrfs_ioctl_defrag(), however BTRFS_IOC_DEFRAG does
not support any argument, so check that and return not supported
if provided. This has valid impact at the user end, in the cli below
  btrfs filesystem defrag -clzo /btrfs
the -c option (or similarly other) is only applicable to the file
defrag, which is either provided in the argument or when used along
with the -r option, however as of now the above cli does not report
any error. This patch will fix it.

Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
 fs/btrfs/ioctl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 7acbd2cf6192..bd1bb7fcea8a 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2608,6 +2608,10 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 			ret = -EPERM;
 			goto out;
 		}
+		if (argp) {
+			ret = -EOPNOTSUPP;
+			goto out;
+		}
 		ret = btrfs_defrag_root(root);
 		if (ret)
 			goto out;
-- 
2.10.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux