From 19e129618d47987618c71c4f129ba8dfa2669569 Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Wed, 16 May 2018 11:13:34 -0700 Subject: iomap: don't allow holes in swapfiles 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 Signed-off-by: Omar Sandoval Reviewed-by: Christoph Hellwig Reviewed-by: Jan Kara Signed-off-by: Darrick J. Wong --- fs/iomap.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'fs/iomap.c') diff --git a/fs/iomap.c b/fs/iomap.c index 89517442e296..f2456d0d8ddd 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1220,10 +1220,6 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos, return -EINVAL; } - /* Skip holes. */ - if (iomap->type == IOMAP_HOLE) - goto out; - /* Only real or unwritten extents. */ if (iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN) { pr_err("swapon: file has unallocated extents\n"); @@ -1259,7 +1255,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; } -- cgit v1.2.3