X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_locks.c;h=2f870368132ef3a882eef1f636d92ba889d9d499;hp=6e7df6b747c26a04df3c9a89862ac0bb6a58ef90;hb=4f78164f8748cf8013331637ba33388e83fbd627;hpb=76965ebc257ef1a090df2b21f107739f6471a9af

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 6e7df6b..2f87036 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -812,7 +812,8 @@ static int mdc_enqueue_base(struct obd_export *exp,
 
 	generation = obddev->u.cli.cl_import->imp_generation;
 	if (!it || (it->it_op & (IT_OPEN | IT_CREAT)))
-		acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+		acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+				  XATTR_SIZE_MAX);
 	else
 		acl_bufsize = LUSTRE_POSIX_ACL_MAX_SIZE_OLD;
 
@@ -934,10 +935,11 @@ resend:
 
 	if ((int)lockrep->lock_policy_res2 == -ERANGE &&
 	    it->it_op & (IT_OPEN | IT_GETATTR | IT_LOOKUP) &&
-	    acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
+	    acl_bufsize == LUSTRE_POSIX_ACL_MAX_SIZE_OLD) {
 		mdc_clear_replay_flag(req, -ERANGE);
 		ptlrpc_req_finished(req);
-		acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+		acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+				  XATTR_SIZE_MAX);
 		goto resend;
 	}