aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-03-23 12:10:29 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:17:02 +0200
commit8bc6ef890c869099514bdaf72354f84c8517b7c2 (patch)
treee651698984eb99a06e380158dc35f95713466d79
parent642530739f198fe6a9f419b3825b1af54aa7d83f (diff)
downloadlinux-yocto-8bc6ef890c869099514bdaf72354f84c8517b7c2.tar.gz
linux-yocto-8bc6ef890c869099514bdaf72354f84c8517b7c2.tar.bz2
linux-yocto-8bc6ef890c869099514bdaf72354f84c8517b7c2.zip
ext4: prohibit fstrim in norecovery mode
[ Upstream commit 18915b5873f07e5030e6fb108a050fa7c71c59fb ] The ext4 fstrim implementation uses the block bitmaps to find free space that can be discarded. If we haven't replayed the journal, the bitmaps will be stale and we absolutely *cannot* use stale metadata to zap the underlying storage. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/ext4/ioctl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 2e76fb55d94a..5f24fdc140ad 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -999,6 +999,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;