aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-06 17:31:30 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-06 17:31:30 -0400
commit01eb7c07968fdab0cca0d2474346cff176537de8 (patch)
tree6f83c514aef9ea83e313524a7c460cfddaca0397
parent6b61b072a8b54212ab0808c443e5c16699390d25 (diff)
[GFS2] Fix warning on impossible event in eattr code
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>
-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 346601538ac7..2e114c075707 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,
374 return 0; 374 return 0;
375 375
376 if (er->er_data_len) { 376 if (er->er_data_len) {
377 char *prefix; 377 char *prefix = NULL;
378 unsigned int l; 378 unsigned int l = 0;
379 char c = 0; 379 char c = 0;
380 380
381 if (ei->ei_size + ea_size > er->er_data_len) 381 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,
394 prefix = "security."; 394 prefix = "security.";
395 l = 9; 395 l = 9;
396 break; 396 break;
397 default:
398 /* FIXME: Needs looking at again */
399 break;
400 } 397 }
401 398
399 BUG_ON(l == 0);
400
402 memcpy(er->er_data + ei->ei_size, prefix, l); 401 memcpy(er->er_data + ei->ei_size, prefix, l);
403 memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea), 402 memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea),
404 ea->ea_name_len); 403 ea->ea_name_len);