gfs2: Return more useful errors from gfs2_rgrp_send_discards()
PATCH RESEND 1/1 gfs2: Return more useful errors from gfs2_rgrp_send_discards()
The bug that 27ca8273f ("gfs2: Make sure FITRIM minlen is rounded up to fs block size") fixes was a little confusing as the user saw "Input/output error" which masked the -EINVAL that sb_issue_discard() returned.
sb_issue_discard() can fail for various reasons, so we should return its return value from gfs2_rgrp_send_discards() to avoid all errors being reported as IO errors.
This improves error reporting for FITRIM and makes no difference to the -o discard code path because the return value from gfs2_rgrp_send_discards() gets thrown away in that case (and the option switches off). Presumably that's why it was ok to just return -EIO in the past, before FITRIM was implemented.
Tested with xfstests.
---
I don't see this in for-next yet so I've updated the commit log to include more details.
fs/gfs2/rgrp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/gfs2/rgrp.c +2 -2
@@ -1315,7 +1315,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,u64 blk;sector_t start =0 ;sector_t nr_blks =0 ; -int rv; +int rv = -EIO ;unsigned int x;u32 trimmed =0 ;u8 diff;
@@ -1371,7 +1371,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,if (sdp->sd_args.ar_discard)fs_warn (sdp,"error %d on discard request, turning discards off for this filesystem\n" , rv); sdp->sd_args.ar_discard =0 ; -return -EIO ; +return rv; }/**
Signature · 1 line
2.35.1
PATCH RESEND 1/1 gfs2: Return more useful errors from gfs2_rgrp_send_discards()
Quoted 9 lines · Andrew Price
The bug that
27ca8273f("gfs2: Make sure FITRIM minlen is rounded up to fs block size") fixes was a little confusing as the user saw "Input/output error" which masked the-EINVALthatsb_issue_discard()returned.
sb_issue_discard()can fail for various reasons, so we should return its return value fromgfs2_rgrp_send_discards()to avoid all errors being reported as IO errors.
Quoted 7 lines
This improves error reporting for FITRIM and makes no difference to the -o discard code path because the return value from
gfs2_rgrp_send_discards()gets thrown away in that case (and the option switches off). Presumably that's why it was ok to just return-EIOin the past, before FITRIM was implemented.Tested with xfstests.
Can I get a thumbs-up or thumbs-down for this patch? It's pretty straightforward. I just don't want it to get forgotten about.
Cheers,
Andy
Quoted 31 lines
Signed-off-by Andrew Price <[email protected]>---
I don't see this in for-next yet so I've updated the commit log to include more details.
fs/gfs2/rgrp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/gfs2/rgrp.c +2
-2@@ -1315,7 +1315,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,u64 blk;sector_t start =0 ;sector_t nr_blks =0 ; -int rv; +int rv = -EIO ;unsigned int x;u32 trimmed =0 ;u8 diff;@@ -1371,7 +1371,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset,if (sdp->sd_args.ar_discard)fs_warn (sdp,"error %d on discard request, turning discards off for this filesystem\n" , rv); sdp->sd_args.ar_discard =0 ; -return -EIO ; +return rv; }/**
PATCH RESEND 1/1 gfs2: Return more useful errors from gfs2_rgrp_send_discards()
Quoted 16 lines · Andrew Price
Quoted 15 lines · Andrew Price
The bug that
27ca8273f("gfs2: Make sure FITRIM minlen is rounded up to fs block size") fixes was a little confusing as the user saw "Input/output error" which masked the-EINVALthatsb_issue_discard()returned.
sb_issue_discard()can fail for various reasons, so we should return its return value fromgfs2_rgrp_send_discards()to avoid all errors being reported as IO errors.This improves error reporting for FITRIM and makes no difference to the -o discard code path because the return value from
gfs2_rgrp_send_discards()gets thrown away in that case (and the option switches off). Presumably that's why it was ok to just return-EIOin the past, before FITRIM was implemented.
Quoted 7 lines
Quoted 1 line
Tested with xfstests.
Can I get a thumbs-up or thumbs-down for this patch? It's pretty straightforward. I just don't want it to get forgotten about.
Cheers,
Andy
Please could you take this patch?
Cheers,
Andy
Quoted 35 lines
Quoted 34 lines
Signed-off-by Andrew Price <[email protected]>---
I don't see this in for-next yet so I've updated the commit log to include more
details.?
fs/gfs2/rgrp.c| 4 ++--
? 1 file changed, 2 insertions(+), 2 deletions(-)fs/gfs2/rgrp.c +1
-1@@ -1315,7 +1315,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, ????? u64 blk; ????? sector_t start = 0; ????? sector_t nr_blks = 0; -??? int rv; +??? int rv = -EIO; ????? unsigned int x; ????? u32 trimmed = 0;????? u8 diff;
fs/gfs2/rgrp.c +0
-0@@ -1371,7 +1371,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, ????? if (sdp->sd_args.ar_discard)?????????
fs_warn(sdp, "error %d on discard request, turning discards off for this filesystem\n", rv);
?????sdp->sd_args.ar_discard= 0;
-??? return-EIO;
+??? return rv;
? }
? /**
PATCH RESEND 1/1 gfs2: Return more useful errors from gfs2_rgrp_send_discards()
Quoted 22 lines · Andrew Price
Quoted 21 lines · Andrew Price
Quoted 9 lines · Andrew Price
The bug that
27ca8273f("gfs2: Make sure FITRIM minlen is rounded up to fs block size") fixes was a little confusing as the user saw "Input/output error" which masked the-EINVALthatsb_issue_discard()returned.
sb_issue_discard()can fail for various reasons, so we should return its return value fromgfs2_rgrp_send_discards()to avoid all errors being reported as IO errors.Quoted 7 lines
This improves error reporting for FITRIM and makes no difference to the -o discard code path because the return value from
gfs2_rgrp_send_discards()gets thrown away in that case (and the option switches off). Presumably that's why it was ok to just return-EIOin the past, before FITRIM was implemented.Tested with xfstests.
Can I get a thumbs-up or thumbs-down for this patch? It's pretty straightforward. I just don't want it to get forgotten about.
Quoted 7 lines
Quoted 2 lines
Cheers,
AndyPlease could you take this patch?
Cheers,
Andy
For convenience, I've pushed this patch to gitlab:
git fetch https://gitlab.com/andyprice/linux.git discard_errors git show FETCH_HEAD
Cheers,
Andy
Quoted 36 lines
Quoted 35 lines
Quoted 34 lines
Signed-off-by Andrew Price <[email protected]>---
I don't see this in for-next yet so I've updated the commit log to include more
details.?
fs/gfs2/rgrp.c| 4 ++--
? 1 file changed, 2 insertions(+), 2 deletions(-)fs/gfs2/rgrp.c +1
-1@@ -1315,7 +1315,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, ????? u64 blk; ????? sector_t start = 0; ????? sector_t nr_blks = 0; -??? int rv; +??? int rv = -EIO; ????? unsigned int x; ????? u32 trimmed = 0;????? u8 diff;
fs/gfs2/rgrp.c +0
-0@@ -1371,7 +1371,7 @@ int gfs2_rgrp_send_discards(struct gfs2_sbd *sdp, u64 offset, ????? if (sdp->sd_args.ar_discard)?????????
fs_warn(sdp, "error %d on discard request, turning discards off for this filesystem\n", rv);
?????sdp->sd_args.ar_discard= 0;
-??? return-EIO;
+??? return rv;
? }
? /**
Andreas Gruenbacher
maintainerPATCH RESEND 1/1 gfs2: Return more useful errors from gfs2_rgrp_send_discards()
Quoted 28 lines · Andrew Price
Quoted 27 lines · Andrew Price
Quoted 16 lines · Andrew Price
Quoted 15 lines · Andrew Price
The bug that
27ca8273f("gfs2: Make sure FITRIM minlen is rounded up to fs block size") fixes was a little confusing as the user saw "Input/output error" which masked the-EINVALthatsb_issue_discard()returned.
sb_issue_discard()can fail for various reasons, so we should return its return value fromgfs2_rgrp_send_discards()to avoid all errors being reported as IO errors.This improves error reporting for FITRIM and makes no difference to the -o discard code path because the return value from
gfs2_rgrp_send_discards()gets thrown away in that case (and the option switches off). Presumably that's why it was ok to just return-EIOin the past, before FITRIM was implemented.Quoted 7 lines
Quoted 1 line
Tested with xfstests.
Can I get a thumbs-up or thumbs-down for this patch? It's pretty straightforward. I just don't want it to get forgotten about.
Cheers,
AndyPlease could you take this patch?
Quoted 7 lines
Quoted 2 lines
Cheers,
AndyFor convenience, I've pushed this patch to gitlab:
git fetch https://gitlab.com/andyprice/linux.git
discard_errorsgit showFETCH_HEAD
Pulled, thanks.
Andreas