diff --git a/[refs] b/[refs]
index 2377b5df1ea9..51a88db0134f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 639b6d79b8c20cce4079fb035640c65456324d1c
+refs/heads/master: 90cdd2083aea9a536ecdef62840db01fff2e645d
diff --git a/trunk/fs/gfs2/eattr.c b/trunk/fs/gfs2/eattr.c
index 187fba1c4678..346601538ac7 100644
--- a/trunk/fs/gfs2/eattr.c
+++ b/trunk/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;