1 files changed, 12 insertions, 3 deletions

diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index f5169a42a91..187fba1c467 100644
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -368,7 +368,7 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,
 {
         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 = gfs2_ea_strlen(ea);
 
         if (ea->ea_type == GFS2_EATYPE_UNUSED)
                 return 0;
@@ -381,12 +381,21 @@ static int ea_list_i(struct gfs2_inode *ip, struct buffer_head *bh,
                 if (ei->ei_size + ea_size > er->er_data_len)
                         return -ERANGE;
 
-                if (ea->ea_type == GFS2_EATYPE_USR) {
+                switch (ea->ea_type) {
+                case GFS2_EATYPE_USR:
                         prefix = "user.";
                         l = 5;
-                } else {
+                        break;
+                case GFS2_EATYPE_SYS:
                         prefix = "system.";
                         l = 7;
+                        break;
+                case GFS2_EATYPE_SECURITY:
+                        prefix = "security.";
+                        l = 9;
+                        break;
+                default:
+                        break;
                 }
 
                 memcpy(er->er_data + ei->ei_size,