diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2011-02-15 18:07:36 +0100 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-02-22 22:08:44 +0100 |
| commit | be715140b5c3baf8ab6708060cfab80bef279d18 (patch) | |
| tree | f16e9241cd872adab59485e66523f9fb7eb7ab3b /fs | |
| parent | xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 (diff) | |
| download | linux-be715140b5c3baf8ab6708060cfab80bef279d18.tar.xz linux-be715140b5c3baf8ab6708060cfab80bef279d18.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.c | 2 |
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); |