hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iomap: provide more useful errors for invalid swap files 

Currently, for an invalid swap file, we print the same error message
regardless of the reason. This isn't very useful for an admin, who will
likely want to know why exactly they can't use their swap file. So,
let's add specific error messages for each reason, and also move the
bdev check after the flags checks, since the latter are more
fundamental.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Omar Sandoval 2018-05-16 11:13:34 -07:00 committed by Darrick J. Wong
parent f7664b3197
commit ec601924df
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fs/iomap.c
View File

@ -1214,26 +1214,37 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
struct iomap_swapfile_info *isi = data;
int error;
/* No inline data. */
if (iomap->flags & IOMAP_F_DATA_INLINE) {
pr_err("swapon: file is inline\n");
return -EINVAL;
}
/* Skip holes. */
if (iomap->type == IOMAP_HOLE)
goto out;
/* Only one bdev per swap file. */
if (iomap->bdev != isi->sis->bdev)
goto err;
/* Only real or unwritten extents. */
if (iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN)
goto err;
if (iomap->type != IOMAP_MAPPED && iomap->type != IOMAP_UNWRITTEN) {
pr_err("swapon: file has unallocated extents\n");
return -EINVAL;
}
/* No uncommitted metadata or shared blocks or inline data. */
if (iomap->flags & (IOMAP_F_DIRTY | IOMAP_F_SHARED |
IOMAP_F_DATA_INLINE))
goto err;
/* No uncommitted metadata or shared blocks. */
if (iomap->flags & IOMAP_F_DIRTY) {
pr_err("swapon: file is not committed\n");
return -EINVAL;
}
if (iomap->flags & IOMAP_F_SHARED) {
pr_err("swapon: file has shared extents\n");
return -EINVAL;
}
/* No null physical addresses. */
if (iomap->addr == IOMAP_NULL_ADDR)
goto err;
/* Only one bdev per swap file. */
if (iomap->bdev != isi->sis->bdev) {
pr_err("swapon: file is on multiple devices\n");
return -EINVAL;
}
if (isi->iomap.length == 0) {
/* No accumulated extent, so just store it. */
@ -1250,9 +1261,6 @@ static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
}
out:
return count;
err:
pr_err("swapon: file cannot be used for swap\n");
return -EINVAL;
}
/*