From 9aff29997ed22932f78aa8d8c7c2412e9d3f49e5 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Sun, 20 Sep 2009 04:28:22 +0200 Subject: swaponoff: add uuid/label support. By Natanael Copa function old new delta swap_enable_disable 130 150 +20 resolve_mount_spec 76 96 +20 mount_main 1152 1154 +2 findfs_main 125 80 -45 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/1 up/down: 42/-45) Total: -3 bytes Signed-off-by: Natanael Copa Signed-off-by: Denys Vlasenko --- util-linux/swaponoff.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'util-linux/swaponoff.c') diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 863f7734a..33ad00ac1 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -11,6 +11,12 @@ #include #include +#if ENABLE_FEATURE_MOUNT_LABEL +# include "volume_id.h" +#else +# define resolve_mount_spec(fsname) ((void)0) +#endif + #if ENABLE_FEATURE_SWAPON_PRI struct globals { int flags; @@ -26,6 +32,7 @@ static int swap_enable_disable(char *device) int status; struct stat st; + resolve_mount_spec(&device); xstat(device, &st); #if ENABLE_DESKTOP -- cgit v1.2.3