summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2011-02-15 17:07:36 +0000
committerAlex Elder <aelder@sgi.com>2011-02-21 20:39:00 -0600
commit5d15765594eeb5d82c5630b3428ea0ac4f7d3c31 (patch)
tree9897dec4f6487acc63e76575910655df5a959e82 /fs
parentc4d0c3b097f7584772316ee4d64a09fe0e4ddfca (diff)
downloadlinux-stable-5d15765594eeb5d82c5630b3428ea0ac4f7d3c31.tar.gz
linux-stable-5d15765594eeb5d82c5630b3428ea0ac4f7d3c31.tar.bz2
linux-stable-5d15765594eeb5d82c5630b3428ea0ac4f7d3c31.zip
xfs: check if device support discard in xfs_ioc_trim()
Right now we, are relying on the fact that when we attempt to actually do the discard, blkdev_issue_discar() returns -EOPNOTSUPP and the user is informed that the device does not support discard. However, in the case where the we do not hit any suitable free extent to trim in FITRIM code, it will finish without any error. This is very confusing, because it seems that FITRIM was successful even though the device does not actually supports discard. Solution: Check for the discard support before attempt to search for free extents. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/linux-2.6/xfs_discard.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_discard.c b/fs/xfs/linux-2.6/xfs_discard.c
index 05201ae719e5..d61611c88012 100644
--- a/fs/xfs/linux-2.6/xfs_discard.c
+++ b/fs/xfs/linux-2.6/xfs_discard.c
@@ -152,6 +152,8 @@ xfs_ioc_trim(
if (!capable(CAP_SYS_ADMIN))
return -XFS_ERROR(EPERM);
+ if (!blk_queue_discard(q))
+ return -XFS_ERROR(EOPNOTSUPP);
if (copy_from_user(&range, urange, sizeof(range)))
return -XFS_ERROR(EFAULT);