fstrim -a/-A: Skip read-only volumes

Calling TRIM on some read-only volumes can fail with:
fstrim: /win: FITRIM ioctl failed: Bad file descriptor

Skipping all read-only mounts seems to be safe and logical strategy.

Fixes opensuse#1106214.

Signed-off-by: Stanislav Brabec <sbrabec@suse.cz>

diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index ff029015e60acef25a531f96648c82065c7ca02c..ea29a569581bb8b5fb93934f5435ad22bf635cce 100644 (file)
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -311,6 +311,14 @@ static int fstrim_all(struct fstrim_control *ctl)
                if (rc)
                        continue;       /* overlaying mount */
 
+               /* FSTRIM on read-only filesystem can fail, and it can fail */
+               if (access(path, W_OK) != 0) {
+                       if (errno == EROFS)
+                               continue;
+                       if (errno == EACCES)
+                               continue;
+               }
+
                if (!has_discard(src, &wholedisk))
                        continue;
                cnt++;