Browse Source

ocfs2: return EOPNOTSUPP if the device does not support discard

For FITRIM ioctl(2), we should return EOPNOTSUPP to inform the user that
the storage device does not support discard if it is, otherwise return
success would confuse the user even though there is no free blocks were
trimmed at all.

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>
Jie Liu 11 years ago
parent
commit
19e8ac2721
1 changed files with 5 additions and 0 deletions
  1. 5 0
      fs/ocfs2/ioctl.c

+ 5 - 0
fs/ocfs2/ioctl.c

@@ -7,6 +7,7 @@
 
 
 #include <linux/fs.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/mount.h>
+#include <linux/blkdev.h>
 #include <linux/compat.h>
 #include <linux/compat.h>
 
 
 #include <cluster/masklog.h>
 #include <cluster/masklog.h>
@@ -966,12 +967,16 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	case FITRIM:
 	case FITRIM:
 	{
 	{
 		struct super_block *sb = inode->i_sb;
 		struct super_block *sb = inode->i_sb;
+		struct request_queue *q = bdev_get_queue(sb->s_bdev);
 		struct fstrim_range range;
 		struct fstrim_range range;
 		int ret = 0;
 		int ret = 0;
 
 
 		if (!capable(CAP_SYS_ADMIN))
 		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;
 			return -EPERM;
 
 
+		if (!blk_queue_discard(q))
+			return -EOPNOTSUPP;
+
 		if (copy_from_user(&range, argp, sizeof(range)))
 		if (copy_from_user(&range, argp, sizeof(range)))
 			return -EFAULT;
 			return -EFAULT;