b=23531 fix wrong variable use cases in "lustre_acl_xattr_merge2ext()"

fix wrong variable use cases in "lustre_acl_xattr_merge2ext()"

i=Mikhail.Pershin
i=di.wang

diff --git a/lustre/obdclass/acl.c b/lustre/obdclass/acl.c
index 3222183..cd877dd 100644 (file)
--- a/lustre/obdclass/acl.c
+++ b/lustre/obdclass/acl.c
@@ -766,12 +766,12 @@ lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,
                                 if (posix_header->a_entries[i].e_perm !=
                                                                 ee->e_perm)
                                         /* entry modified. */
                                 if (posix_header->a_entries[i].e_perm !=
                                                                 ee->e_perm)
                                         /* entry modified. */

-                                        ee->e_perm =
+                                        ee->e_stat =

                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_MOD);
                                 else
                                         /* entry unchanged. */
                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_MOD);
                                 else
                                         /* entry unchanged. */

-                                        ee->e_perm =
+                                        ee->e_stat =

                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_UNC);
                         } else {
                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_UNC);
                         } else {


@@ -796,12 +796,12 @@ lustre_acl_xattr_merge2ext(posix_acl_xattr_header *posix_header, int size,
                                 if (posix_header->a_entries[i].e_perm !=
                                                                 ee->e_perm)
                                         /* entry modified. */
                                 if (posix_header->a_entries[i].e_perm !=
                                                                 ee->e_perm)
                                         /* entry modified. */

-                                        ee->e_perm =
+                                        ee->e_stat =

                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_MOD);
                                 else
                                         /* entry unchanged. */
                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_MOD);
                                 else
                                         /* entry unchanged. */

-                                        ee->e_perm =
+                                        ee->e_stat =

                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_UNC);
                         } else {
                                         new->a_entries[j++].e_stat =
                                                         cpu_to_le32(ES_UNC);
                         } else {