Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2725643 authored by Nitin Gupta's avatar Nitin Gupta Committed by Greg Kroah-Hartman
Browse files

swap: Add flag to identify block swap devices 



Added SWP_BLKDEV flag to distinguish block and regular file backed
swap devices. We could also check if a swap is entire block device,
rather than a file, by:
S_ISBLK(swap_info_struct->swap_file->f_mapping->host->i_mode)
but, I think, simply checking this flag is more convenient.

Signed-off-by: default avatarNitin Gupta <ngupta@vflare.org>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarNigel Cunningham <nigel@tuxonice.net>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f4a68b93

include/linux/swap.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ enum { 
	SWP_DISCARDING	= (1 << 3),	/* now discarding a free cluster */

	SWP_SOLIDSTATE	= (1 << 4),	/* blkdev seeks are cheap */

	SWP_CONTINUED	= (1 << 5),	/* swap_map has count continuation */

	SWP_BLKDEV	= (1 << 6),	/* its a block device */

					/* add others here before... */

	SWP_SCANNING	= (1 << 8),	/* refcount in scan_swap_map */

};

mm/swapfile.c

+1 −0
Original line number Diff line number Diff line
@@ -1884,6 +1884,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
		if (error < 0)

			goto bad_swap;

		p->bdev = bdev;

		p->flags |= SWP_BLKDEV;

	} else if (S_ISREG(inode->i_mode)) {

		p->bdev = inode->i_sb->s_bdev;

		mutex_lock(&inode->i_mutex);