From patchwork Mon Sep 30 18:54:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11167045 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DEC6B16B1 for ; Mon, 30 Sep 2019 18:57:02 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6E1F224D5 for ; Mon, 30 Sep 2019 18:57:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6E1F224D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 6D0135C344D; Mon, 30 Sep 2019 11:57:01 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp4.ccs.ornl.gov (smtp4.ccs.ornl.gov [160.91.203.40]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 28D835C3165 for ; Mon, 30 Sep 2019 11:56:59 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 2DC0C100536C; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 260FBB5; Mon, 30 Sep 2019 14:56:56 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 30 Sep 2019 14:54:21 -0400 Message-Id: <1569869810-23848-3-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> References: <1569869810-23848-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 002/151] lustre: fix signal handling in abortable waits. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: NeilBrown Instead of blocking all but the fatal signals, we were blocking just the fatal signals. That wasn't what was intended, but is easy to fix. Signed-off-by: NeilBrown Signed-off-by: James Simmons --- fs/lustre/include/lustre_lib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/lustre/include/lustre_lib.h b/fs/lustre/include/lustre_lib.h index da86e46..64d2e91 100644 --- a/fs/lustre/include/lustre_lib.h +++ b/fs/lustre/include/lustre_lib.h @@ -93,7 +93,7 @@ static inline int l_fatal_signal_pending(struct task_struct *p) ({ \ sigset_t __new_blocked, __old_blocked; \ int __ret = 0; \ - siginitset(&__new_blocked, LUSTRE_FATAL_SIGS); \ + siginitsetinv(&__new_blocked, LUSTRE_FATAL_SIGS); \ sigprocmask(SIG_BLOCK, &__new_blocked, &__old_blocked); \ __ret = wait_event_interruptible(wq, condition); \ sigprocmask(SIG_SETMASK, &__old_blocked, NULL); \ @@ -104,7 +104,7 @@ static inline int l_fatal_signal_pending(struct task_struct *p) ({ \ sigset_t __new_blocked, __old_blocked; \ int __ret = 0; \ - siginitset(&__new_blocked, LUSTRE_FATAL_SIGS); \ + siginitsetinv(&__new_blocked, LUSTRE_FATAL_SIGS); \ sigprocmask(SIG_BLOCK, &__new_blocked, &__old_blocked); \ __ret = wait_event_interruptible_timeout(wq, condition, timeout);\ sigprocmask(SIG_SETMASK, &__old_blocked, NULL); \ @@ -115,7 +115,7 @@ static inline int l_fatal_signal_pending(struct task_struct *p) ({ \ sigset_t __new_blocked, __old_blocked; \ int __ret = 0; \ - siginitset(&__new_blocked, LUSTRE_FATAL_SIGS); \ + siginitsetinv(&__new_blocked, LUSTRE_FATAL_SIGS); \ sigprocmask(SIG_BLOCK, &__new_blocked, &__old_blocked); \ __ret = wait_event_interruptible_exclusive(wq, condition); \ sigprocmask(SIG_SETMASK, &__old_blocked, NULL); \