Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01eb7c07 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 6b61b072

fs/gfs2/eattr.c

+4 −5
Original line number Diff line number Diff line
@@ -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);