LU-11868 mdc: Improve xattr buffer allocations

[fs/lustre-release.git] / lustre / mdc / mdc_request.c

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 8aa80d7..4941f06 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -239,9 +239,9 @@ again:
 
        rc = mdc_getattr_common(exp, req);
        if (rc) {
-               if (rc == -ERANGE &&
-                   acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
-                       acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+               if (rc == -ERANGE) {
+                       acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+                                         XATTR_SIZE_MAX);
                        mdc_reset_acl_req(req);
                        goto again;
                }
@@ -294,9 +294,9 @@ again:
 
        rc = mdc_getattr_common(exp, req);
        if (rc) {
-               if (rc == -ERANGE &&
-                   acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
-                       acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+               if (rc == -ERANGE) {
+                       acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+                                         XATTR_SIZE_MAX);
                        mdc_reset_acl_req(req);
                        goto again;
                }