summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-03-14 22:55:39 +0000
committerDenis Vlasenko2007-03-14 22:55:39 +0000
commit56594075951157801d172851ec38b0eee1b0f44b (patch)
tree790c7b63197a0ad8011a47b2decdefbe3fc62c96
parent7f2527e5a7f513b9f415643ddc0ecd236b596887 (diff)
downloadbusybox-56594075951157801d172851ec38b0eee1b0f44b.zip
busybox-56594075951157801d172851ec38b0eee1b0f44b.tar.gz
swapon: reinstate hole check but reduce it to warning
inode_hash: remove unused variable
-rw-r--r--libbb/inode_hash.c1
-rw-r--r--util-linux/swaponoff.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index 55a7564..0705102 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 3a6afe2..8930035 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')