---

yaml --- r: 142301 b: refs/heads/master c: fc371a2 h: refs/heads/master i: 142299: 3088b95 v: v3
git-mirror · Mar 20, 2009 · 438205d · 438205d
1 parent af0fc24
commit 438205d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4b6d516a6079c6ba8dc97d185371439035a35d0
+refs/heads/master: fc371a25eab8816d49c2d322d91b48a11e206018
diff --git a/trunk/fs/jffs2/acl.c b/trunk/fs/jffs2/acl.c
@@ -38,12 +38,12 @@ static int jffs2_acl_count(size_t size)
 	size_t s;
 
 	size -= sizeof(struct jffs2_acl_header);
-	s = size - 4 * sizeof(struct jffs2_acl_entry_short);
-	if (s < 0) {
+	if (size < 4 * sizeof(struct jffs2_acl_entry_short)) {
 		if (size % sizeof(struct jffs2_acl_entry_short))
 			return -1;
 		return size / sizeof(struct jffs2_acl_entry_short);
 	} else {
+		s = size - 4 * sizeof(struct jffs2_acl_entry_short);
 		if (s % sizeof(struct jffs2_acl_entry))
 			return -1;
 		return s / sizeof(struct jffs2_acl_entry) + 4;