[v2,2/2] iomap: don't allow holes in swapfiles

Commit Message

Omar Sandoval May 16, 2018, 4:45 p.m. UTC

From: Omar Sandoval <[e-mail]>

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")
Reviewed-by: Darrick J. Wong <[e-mail]>
Signed-off-by: Omar Sandoval <[e-mail]>
---
 fs/iomap.c | 5 -----
 1 file changed, 5 deletions(-)

Patch

diff --git a/fs/iomap.c b/fs/iomap.c
index 318724375ffe..5a1099d935c3 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1214,10 +1214,6 @@  static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
 	struct iomap_swapfile_info *isi = data;
 	int error;
 
-	/* Skip holes. */
-	if (iomap->type == IOMAP_HOLE)
-		goto out;
-
 	/* Only real or unwritten extents. */
 	if ((iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN) ||
 	    iomap->addr == IOMAP_NULL_ADDR) {
@@ -1258,7 +1254,6 @@  static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
 			return error;
 		memcpy(&isi->iomap, iomap, sizeof(isi->iomap));
 	}
-out:
 	return count;
 }