Commit 6a98c333 authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse
Browse files

GFS2: Fix fstrim boundary conditions



This patch correctly distinguishes two boundary conditions:

1. When the given range is entire within the unaccounted space between
   two rgrps, and
2. The range begins beyond the end of the filesystem

Also fix the unit of the returned value r.len (total trimming) to be in bytes 
instead of the (incorrect) 512 byte blocks

With this patch, GFS2 passes multiple iterations of all the relevant xfstests
(251, 260, 288) with different fs block sizes.
Signed-off-by: default avatarAbhi Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 2b12eea6
...@@ -1288,13 +1288,15 @@ int gfs2_fitrim(struct file *filp, void __user *argp) ...@@ -1288,13 +1288,15 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
minlen = max_t(u64, r.minlen, minlen = max_t(u64, r.minlen,
q->limits.discard_granularity) >> bs_shift; q->limits.discard_granularity) >> bs_shift;
if (end <= start || minlen > sdp->sd_max_rg_data)
return -EINVAL;
rgd = gfs2_blk2rgrpd(sdp, start, 0); rgd = gfs2_blk2rgrpd(sdp, start, 0);
rgd_end = gfs2_blk2rgrpd(sdp, end - 1, 0); rgd_end = gfs2_blk2rgrpd(sdp, end, 0);
if (end <= start || if ((gfs2_rgrpd_get_first(sdp) == gfs2_rgrpd_get_next(rgd_end))
minlen > sdp->sd_max_rg_data || && (start > rgd_end->rd_data0 + rgd_end->rd_data))
start > rgd_end->rd_data0 + rgd_end->rd_data) return -EINVAL; /* start is beyond the end of the fs */
return -EINVAL;
while (1) { while (1) {
...@@ -1336,7 +1338,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp) ...@@ -1336,7 +1338,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
} }
out: out:
r.len = trimmed << 9; r.len = trimmed << bs_shift;
if (copy_to_user(argp, &r, sizeof(r))) if (copy_to_user(argp, &r, sizeof(r)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment