From: Oleg Drokin Date: Mon, 3 Jun 2019 06:39:41 +0000 (-0400) Subject: LU-10948 mdt: Remove openlock compat code with 2.1 X-Git-Tag: 2.12.55~12 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=f4e39f710f9069208594870b5cdd37879b46a404;hp=ac8bbb3ddd646e4aa04b77cb1e7640b5865f2c04 LU-10948 mdt: Remove openlock compat code with 2.1 Checking openlock when doing a create does not allow us to create a file if we want to also get openlock from it right away. Since 2.1 is no longer something we care about wrt compatibility, ok to kill it. Change-Id: Ic4327be5c45ae856dfbe20291a59c5b1654dbf8f Signed-off-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/35039 Reviewed-by: Patrick Farrell Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index fe0cb34..eb43f79 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -1365,11 +1365,7 @@ int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc) GOTO(out, result = -EFAULT); } CDEBUG(D_INFO, "No object(1), continue as regular open.\n"); - } else if (open_flags & (MDS_OPEN_BY_FID | MDS_OPEN_LOCK)) { - /* - * MDS_OPEN_LOCK is checked for backward compatibility with 2.1 - * client. - */ + } else if (open_flags & MDS_OPEN_BY_FID) { result = mdt_open_by_fid_lock(info, ldlm_rep, lhc); if (result < 0) CDEBUG(D_INFO, "no object for "DFID": %d\n",