swapon: reinstate hole check but reduce it to warning

inode_hash: remove unused variable


git-svn-id: svn://busybox.net/trunk/busybox@18114 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 2 insertions, 3 deletions

diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index 55a7564ce..0705102b8 100644
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -53,7 +53,6 @@ char *is_in_ino_dev_hashtable(const struct stat *statbuf)
 void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
 {
         int i;
-        size_t s;
         ino_dev_hashtable_bucket_t *bucket;
 
         i = hash_inode(statbuf->st_ino);
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 3a6afe29e..893003549 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -18,11 +18,11 @@ static int swap_enable_disable(char *device)
 
         xstat(device, &st);
 
-#ifdef BLOAT
+#if ENABLE_DESKTOP
         /* test for holes */
         if (S_ISREG(st.st_mode))
                 if (st.st_blocks * 512 < st.st_size)
-                        bb_error_msg_and_die("swap file has holes");
+                        bb_error_msg("warning: swap file has holes");
 #endif
 
         if (applet_name[5] == 'n')