From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 22 May 2006 14:36:25 +0000 (-0400)
Subject: [GFS2] Flag up issue in selinux code
X-Git-Tag: v2.6.19-rc1~32^2~189
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=90cdd2083aea9a536ecdef62840db01fff2e645d

[GFS2] Flag up issue in selinux code

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index 187fba1c4678..346601538ac7 100644
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -395,17 +395,14 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,
 			l = 9;
 			break;
 		default:
+			/* FIXME: Needs looking at again */
 			break;
 		}
 
-		memcpy(er->er_data + ei->ei_size,
-		       prefix, l);
-		memcpy(er->er_data + ei->ei_size + l,
-		       GFS2_EA2NAME(ea),
+		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);
+		memcpy(er->er_data + ei->ei_size + ea_size - 1, &c, 1);
 	}
 
 	ei->ei_size += ea_size;