From 65e0802f2ada98f802d01b5672bb9349ad0dde8c Mon Sep 17 00:00:00 2001 From: Aurelien Degremont Date: Tue, 20 Feb 2024 12:46:03 +0100 Subject: [PATCH] LU-17566 mdt: remove duplicate call to mdt_init_ucred_reint() Remove duplicate call to mdt_init_ucred_reint() from mdt_reint_setxattr(). mdt_init_ucred_reint() is called in mdt_reint_internal() which is covering all actual reinters. However, SETXATTR was converted to reinters framework in fd908da and this call was not removed. So mdt_init_ucred_reint() is called first in mdt_reint_internal() then again in the specific mdt_reint_setxattr() handler, without anything special being done on the ucred between them. Also merge __mdt_init_ucred() and mdt_init_cred() which was called only once, and with the same prototype. Signed-off-by: Aurelien Degremont Change-Id: I90fed1d2709edf7337a27dd9c3cb0f75f7625135 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54111 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Sebastien Buisson Reviewed-by: Bruno Faccini Reviewed-by: Oleg Drokin --- lustre/mdt/mdt_lib.c | 8 +------- lustre/mdt/mdt_xattr.c | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c index 13cf30c..68d420e 100644 --- a/lustre/mdt/mdt_lib.c +++ b/lustre/mdt/mdt_lib.c @@ -628,8 +628,7 @@ static int old_init_ucred_reint(struct mdt_thread_info *info) RETURN(rc); } -static inline int __mdt_init_ucred(struct mdt_thread_info *info, - struct mdt_body *body) +int mdt_init_ucred(struct mdt_thread_info *info, struct mdt_body *body) { struct ptlrpc_request *req = mdt_info_req(info); struct lu_ucred *uc = mdt_ucred(info); @@ -646,11 +645,6 @@ static inline int __mdt_init_ucred(struct mdt_thread_info *info, return new_init_ucred(info, BODY_INIT, body); } -int mdt_init_ucred(struct mdt_thread_info *info, struct mdt_body *body) -{ - return __mdt_init_ucred(info, body); -} - int mdt_init_ucred_reint(struct mdt_thread_info *info) { struct ptlrpc_request *req = mdt_info_req(info); diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c index b83f1ce..42424f8 100644 --- a/lustre/mdt/mdt_xattr.c +++ b/lustre/mdt/mdt_xattr.c @@ -544,10 +544,6 @@ int mdt_reint_setxattr(struct mdt_thread_info *info, if (CFS_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR)) RETURN(err_serious(-ENOMEM)); - rc = mdt_init_ucred_reint(info); - if (rc != 0) - RETURN(rc); - if (strncmp(xattr_name, XATTR_USER_PREFIX, sizeof(XATTR_USER_PREFIX) - 1) == 0) { if (!(exp_connect_flags(req->rq_export) & OBD_CONNECT_XATTR)) -- 1.8.3.1