Skip to content

Commit

Permalink
[GFS2] Fix warning on impossible event in eattr code
Browse files Browse the repository at this point in the history
The caller ensures that ea_list_i() is never called with an
invalid type, so lets BUG() if we see one. This clears up
a couple of compiler warnings too.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Jun 6, 2006
1 parent 6b61b07 commit 01eb7c0
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions fs/gfs2/eattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down

0 comments on commit 01eb7c0

Please sign in to comment.