X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_handler.c;h=5168791f678a8866dbab70280b7ceb33c28af9d2;hp=4caa22a4b90301da10f2e2694aea3ff95490d2a6;hb=4f78164f8748cf8013331637ba33388e83fbd627;hpb=76965ebc257ef1a090df2b21f107739f6471a9af;ds=sidebyside

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 4caa22a..5168791 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -597,25 +597,26 @@ again:
 			    exp_connect_large_acl(info->mti_exp) &&
 			    buf->lb_buf != info->mti_big_acl) {
 				if (info->mti_big_acl == NULL) {
+					info->mti_big_aclsize =
+							MIN(mdt->mdt_max_ea_size,
+							    XATTR_SIZE_MAX);
 					OBD_ALLOC_LARGE(info->mti_big_acl,
-							mdt->mdt_max_ea_size);
+							info->mti_big_aclsize);
 					if (info->mti_big_acl == NULL) {
+						info->mti_big_aclsize = 0;
 						CERROR("%s: unable to grow "
 						       DFID" ACL buffer\n",
 						       mdt_obd_name(mdt),
 						       PFID(mdt_object_fid(o)));
 						RETURN(-ENOMEM);
 					}
-
-					info->mti_big_aclsize =
-							mdt->mdt_max_ea_size;
 				}
 
 				CDEBUG(D_INODE, "%s: grow the "DFID
 				       " ACL buffer to size %d\n",
 				       mdt_obd_name(mdt),
 				       PFID(mdt_object_fid(o)),
-				       mdt->mdt_max_ea_size);
+				       info->mti_big_aclsize);
 
 				buf->lb_buf = info->mti_big_acl;
 				buf->lb_len = info->mti_big_aclsize;