1 files changed, 7 insertions, 0 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index eb8ca8d80885..73435444b159 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -1000,6 +1000,13 @@ resizefs_out:
                 if (!blk_queue_discard(q))
                         return -EOPNOTSUPP;
 
+                /*
+                 * We haven't replayed the journal, so we cannot use our
+                 * block-bitmap-guided storage zapping commands.
+                 */
+                if (test_opt(sb, NOLOAD) && ext4_has_feature_journal(sb))
+                        return -EROFS;
+
                 if (copy_from_user(&range, (struct fstrim_range __user *)arg,
                     sizeof(range)))
                         return -EFAULT;