linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iomap: don't allow holes in swapfiles
@ 2018-05-16  6:45 Omar Sandoval
  2018-05-16 15:50 ` Darrick J. Wong
  2018-05-16 16:23 ` Christoph Hellwig
  0 siblings, 2 replies; 8+ messages in thread
From: Omar Sandoval @ 2018-05-16  6:45 UTC (permalink / raw)
  To: Darrick J . Wong, linux-xfs; +Cc: linux-fsdevel, Jan Kara

From: Omar Sandoval <osandov@fb.com>

generic_swapfile_activate() doesn't allow holes, so we should be
consistent here. This is also a bit safer: if the user creates a
swapfile with, say, truncate -s $SIZE followed by mkswap, they should
really get an error and not much less swap space than they expected.
swapon(8) will error out before calling swapon(2) if the file has holes,
anyways.

Fixes: 9d93388b0afe ("iomap: add a swapfile activation function")
Signed-off-by: Omar Sandoval <osandov@fb.com>
---
Hey, Darrick, I noticed this while writing up a generic xfstest to test
that the Btrfs swap support patches don't allow a swapfile with holes.
It'd be nice if we were all consistent :) This is based on
xfs-linux/for-next. Feel free to fold it in to your patch or apply it
separately as you see fit. Thanks!

 fs/iomap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/iomap.c b/fs/iomap.c
index d193390a1c20..ba559adaa327 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1214,9 +1214,9 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
 	struct iomap_swapfile_info *isi = data;
 	int error;
 
-	/* Skip holes. */
+	/* No holes. */
 	if (iomap->type == IOMAP_HOLE)
-		goto out;
+		goto err;
 
 	/* Only one bdev per swap file. */
 	if (iomap->bdev != isi->sis->bdev)
-- 
2.17.0

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-05-16 16:26 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-16  6:45 [PATCH] iomap: don't allow holes in swapfiles Omar Sandoval
2018-05-16 15:50 ` Darrick J. Wong
2018-05-16 15:51   ` Christoph Hellwig
2018-05-16 15:56     ` Darrick J. Wong
2018-05-16 16:19       ` Omar Sandoval
2018-05-16 16:24         ` Christoph Hellwig
2018-05-16 16:23 ` Christoph Hellwig
2018-05-16 16:26   ` Omar Sandoval

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).