From: Li Xi Date: Mon, 17 Apr 2023 15:41:39 +0000 (+0800) Subject: LU-16748 llite: update comment of ll_swap_layouts_close X-Git-Tag: 2.15.56~30 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=cfef0d9d5e708d5343cbd48890395cdcf5a13c3d;p=fs%2Flustre-release.git LU-16748 llite: update comment of ll_swap_layouts_close mdc_close_layout_swap_pack() does not exist, and the lease lock handle is release in mdc_close_intent_pack(). This patch updates the comment. Also, mdt_close_swap_layouts() does not exist. This patch removes its declaration. Test-Parameters: trivial Signed-off-by: Li Xi Change-Id: Iecd1754f627803e85f54a91d648e87e235106bd7 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50660 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Timothy Day --- diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 22e4eac..e3f0ce5 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -1324,7 +1324,7 @@ static int ll_swap_layouts_close(struct obd_client_handle *och, GOTO(out_free_och, rc = -EINVAL); /* Close the file and {swap,merge} layouts between inode & inode2. - * NB: lease lock handle is released in mdc_close_layout_swap_pack() + * NB: local lease handle is released in mdc_close_intent_pack() * because we still need it to pack l_remote_handle to MDT. */ rc = ll_close_inode_openhandle(inode, och, MDS_CLOSE_LAYOUT_SWAP, inode2); diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 4cf9e32..01b0ae2 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -1160,9 +1160,6 @@ bool mdt_hsm_is_action_compat(const struct hsm_action_item *hai, int mdt_hsm_update_request_state(struct mdt_thread_info *mti, struct hsm_progress_kernel *pgs); -int mdt_close_swap_layouts(struct mdt_thread_info *info, - struct mdt_object *o, struct md_attr *ma); - extern struct lu_context_key mdt_thread_key; /* debug issues helper starts here*/