aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/eattr.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index 346601538ac..2e114c07570 100644
--- a/fs/gfs2/eattr.c
+++ b/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);