[GFS2] Fix warning on impossible event in eattr code
authorSteven Whitehouse <swhiteho@redhat.com>
Tue, 6 Jun 2006 21:31:30 +0000 (17:31 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Tue, 6 Jun 2006 21:31:30 +0000 (17:31 -0400)
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>
fs/gfs2/eattr.c

index 346601538ac7c7d5930e8a0fab9796f4ea4fd6de..2e114c0757070704ec32ddbc8e0693419dbfac54 100644 (file)
@@ -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);
This page took 0.025285 seconds and 5 git commands to generate.