Skip to contentSkip to conversation

mm: fix comparisons against unsigned

PATCH New Bill Nottingham 1 participant 1 message May 30, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: fix comparisons against unsigned

Recent gcc versions emit warnings when unsigned variables are compared < 0 or >= 0.

---

 filemap.c |   34 ++++++++++++++++------------------
 slub.c    |    2 --
 2 files changed, 16 insertions(+), 20 deletions(-)

Patch is noisy due to whitespace.

mm/filemap.c +16 -18
diff -ru linux-2.6.21-old/mm/filemap.c linux-2.6.21/mm/filemap.c
@@ -2176,24 +2176,22 @@
 			continue;
 		}
 zero_length_segment:
-		if (likely(copied >= 0)) {
-			if (!status)
-				status = copied;
-
-			if (status >= 0) {
-				written += status;
-				count -= status;
-				pos += status;
-				buf += status;
-				if (unlikely(nr_segs > 1)) {
-					filemap_set_next_iovec(&cur_iov,
-							&iov_base, status);
-					if (count)
-						buf = cur_iov->iov_base +
-							iov_base;
-				} else {
-					iov_base += status;
-				}
+		if (!status)
+			status = copied;
+
+		if (status >= 0) {
+			written += status;
+			count -= status;
+			pos += status;
+			buf += status;
+			if (unlikely(nr_segs > 1)) {
+				filemap_set_next_iovec(&cur_iov,
+						&iov_base, status);
+				if (count)
+					buf = cur_iov->iov_base +
+						iov_base;
+			} else {
+				iov_base += status;
 			}
 		}
 		if (unlikely(copied != bytes))
mm/slub.c +0 -2
diff -ru linux-2.6.21-old/mm/slub.c linux-2.6.21/mm/slub.c
@@ -1966,8 +1966,6 @@
 	s->size = size;
 
 	s->order = calculate_order(size);
-	if (s->order < 0)
-		return 0;
 
 	/*
 	 * Determine the number of objects per slab