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

Commit 21e2156f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Get rid of gfs2_ea_strlen 



Function gfs2_ea_strlen is only called from ea_list_i, so inline it
there.  Remove the duplicate switch statement and the creative use of
memcpy to set a null byte.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarAndrew Price <anprice@redhat.com>
Reviewed-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 3f30f929

fs/gfs2/xattr.c

+22 −37
Original line number Diff line number Diff line
@@ -343,39 +343,19 @@ struct ea_list { 
	unsigned int ei_size;

};



static inline unsigned int gfs2_ea_strlen(struct gfs2_ea_header *ea)

{

	switch (ea->ea_type) {

	case GFS2_EATYPE_USR:

		return 5 + ea->ea_name_len + 1;

	case GFS2_EATYPE_SYS:

		return 7 + ea->ea_name_len + 1;

	case GFS2_EATYPE_SECURITY:

		return 9 + ea->ea_name_len + 1;

	default:

		return 0;

	}

}



static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,

		     struct gfs2_ea_header *ea, struct gfs2_ea_header *prev,

		     void *private)

{

	struct ea_list *ei = private;

	struct gfs2_ea_request *er = ei->ei_er;

	unsigned int ea_size = gfs2_ea_strlen(ea);

	unsigned int ea_size;

	char *prefix;

	unsigned int l;



	if (ea->ea_type == GFS2_EATYPE_UNUSED)

		return 0;



	if (er->er_data_len) {

		char *prefix = NULL;

		unsigned int l = 0;

		char c = 0;



		if (ei->ei_size + ea_size > er->er_data_len)

			return -ERANGE;



	switch (ea->ea_type) {

	case GFS2_EATYPE_USR:

		prefix = "user.";
@@ -389,14 +369,19 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh, 
		prefix = "security.";

		l = 9;

		break;

	default:

		BUG();

	}



		BUG_ON(l == 0);

	ea_size = l + ea->ea_name_len + 1;

	if (er->er_data_len) {

		if (ei->ei_size + ea_size > er->er_data_len)

			return -ERANGE;



		memcpy(er->er_data + ei->ei_size, prefix, l);

		memcpy(er->er_data + ei->ei_size + l, GFS2_EA2NAME(ea),

		       ea->ea_name_len);

		memcpy(er->er_data + ei->ei_size + ea_size - 1, &c, 1);

		er->er_data[ei->ei_size + ea_size - 1] = 0;

	}



	ei->ei_size += ea_size;