svn commit: trunk/busybox: libbb util-linux

vda at busybox.net vda at busybox.net
Wed Mar 14 22:55:40 UTC 2007


Author: vda
Date: 2007-03-14 15:55:39 -0700 (Wed, 14 Mar 2007)
New Revision: 18114

Log:
swapon: reinstate hole check but reduce it to warning
inode_hash: remove unused variable


Modified:
   trunk/busybox/libbb/inode_hash.c
   trunk/busybox/util-linux/swaponoff.c


Changeset:
Modified: trunk/busybox/libbb/inode_hash.c
===================================================================
--- trunk/busybox/libbb/inode_hash.c	2007-03-14 22:11:20 UTC (rev 18113)
+++ trunk/busybox/libbb/inode_hash.c	2007-03-14 22:55:39 UTC (rev 18114)
@@ -53,7 +53,6 @@
 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);

Modified: trunk/busybox/util-linux/swaponoff.c
===================================================================
--- trunk/busybox/util-linux/swaponoff.c	2007-03-14 22:11:20 UTC (rev 18113)
+++ trunk/busybox/util-linux/swaponoff.c	2007-03-14 22:55:39 UTC (rev 18114)
@@ -18,11 +18,11 @@
 
 	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')




More information about the busybox-cvs mailing list