Commit 1ba2212b authored Jan 21, 2014 by Jie Liu Committed by Linus Torvalds Jan 21, 2014

ocfs2: adjust minlen with discard_granularity in the FITRIM ioctl



Adjust minlen with discard_granularity for FITRIM ioctl(2) if the given
minimum size in bytes is less than it because, discard granularity is
used to tell us that the minimum size of extent that can be discarded by
the storage device.

This is inspired by ext4 commit 5c2ed62f ("ext4: Adjust minlen with
discard_granularity in the FITRIM ioctl") from Lukas Czerner.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent aa89762c

fs/ocfs2/ioctl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -980,6 +980,8 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		if (copy_from_user(&range, argp, sizeof(range)))
		return -EFAULT;

		range.minlen = max_t(u64, q->limits.discard_granularity,
		range.minlen);
		ret = ocfs2_trim_fs(sb, &range);
		if (ret < 0)
		return ret;

Admin message