---

yaml --- r: 38708 b: refs/heads/master c: 01eb7c0 h: refs/heads/master v: v3
git-mirror · Jun 6, 2006 · 74020f1 · 74020f1
1 parent cdae3c3
commit 74020f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b61b072a8b54212ab0808c443e5c16699390d25
+refs/heads/master: 01eb7c07968fdab0cca0d2474346cff176537de8
diff --git a/trunk/fs/gfs2/eattr.c b/trunk/fs/gfs2/eattr.c
@@ -374,8 +374,8 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,
 		return 0;
 
 	if (er->er_data_len) {
-		char *prefix;
-		unsigned int l;
+		char *prefix = NULL;
+		unsigned int l = 0;
 		char c = 0;
 
 		if (ei->ei_size + ea_size > er->er_data_len)
@@ -394,11 +394,10 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,
 			prefix = "security.";
 			l = 9;
 			break;
-		default:
-			/* FIXME: Needs looking at again */
-			break;
 		}
 
+		BUG_ON(l == 0);
+
 		memcpy(er->er_data + ei->ei_size, prefix, l);
 		memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea),
 		       ea->ea_name_len);