From c9b10e1bde9205f2e43ec212bd2d4839787d2387 Mon Sep 17 00:00:00 2001 From: Aurelien Degremont Date: Fri, 13 Nov 2020 16:17:37 +0000 Subject: [PATCH] LU-14073 ptlrpc: remove debugging assert using segment_eq() In Linux 5.9-rc1 commit 428e2976a5, segment_eq() is removed as it was only used in uaccess_kernel(). But uaccess_kernel() was introduced in Linux v4.12-rc1, which does not cover all supported kernel versions. As segment_eq() is only used in 1 actual debugging call, avoid adding a new configuration test for uaccess_kernel() and just remove the 2 related LASSERTs. Test-Parameters: trivial Signed-off-by: Aurelien Degremont Change-Id: I1595e9b085176d2106a2b958e1fd6f4031cc2f69 Reviewed-on: https://review.whamcloud.com/40797 Reviewed-by: Andreas Dilger Reviewed-by: Sebastien Buisson Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Neil Brown --- lustre/ptlrpc/sec_ctx.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lustre/ptlrpc/sec_ctx.c b/lustre/ptlrpc/sec_ctx.c index 6342749..fffb7f2 100644 --- a/lustre/ptlrpc/sec_ctx.c +++ b/lustre/ptlrpc/sec_ctx.c @@ -38,13 +38,8 @@ /* Debugging check only needed during development */ #ifdef OBD_CTXT_DEBUG # define ASSERT_CTXT_MAGIC(magic) LASSERT((magic) == OBD_RUN_CTXT_MAGIC) -# define ASSERT_NOT_KERNEL_CTXT(msg) LASSERTF(!segment_eq(get_fs(), KERNEL_DS),\ - msg) -# define ASSERT_KERNEL_CTXT(msg) LASSERTF(segment_eq(get_fs(), KERNEL_DS), msg) #else # define ASSERT_CTXT_MAGIC(magic) do {} while(0) -# define ASSERT_NOT_KERNEL_CTXT(msg) do {} while(0) -# define ASSERT_KERNEL_CTXT(msg) do {} while(0) #endif static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, @@ -74,7 +69,6 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx) if (new_ctx->dt != NULL) return; - //ASSERT_NOT_KERNEL_CTXT("already in kernel context!\n"); ASSERT_CTXT_MAGIC(new_ctx->magic); OBD_SET_CTXT_MAGIC(save); @@ -103,7 +97,6 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx) return; ASSERT_CTXT_MAGIC(saved->magic); - ASSERT_KERNEL_CTXT("popping non-kernel context!\n"); LASSERTF(current->fs->pwd.dentry == new_ctx->pwd, "%p != %p\n", current->fs->pwd.dentry, new_ctx->pwd); -- 1.8.3.1