Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     paul@paul-moore.com, eparis@redhat.com,
        linux-kernel@vger.kernel.org, audit@vger.kernel.org
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Subject: [PATCH 3/4] audit: convert DECLARE_WAITQUEUE to DEFINE_WAIT
Date:   Mon,  8 May 2023 07:58:11 +0000
Message-Id: <20230508075812.76077-4-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230508075812.76077-1-eiichi.tsukata@nutanix.com>
References: <20230508075812.76077-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ikb7DKkH/ItqWdIVAXVIJkF6ZybSo7DPP6bU1tUWdJJs5/Bd9o0QxhR40iut?=
 =?us-ascii?Q?uTtbAjvZ6FsBJ8O6fkgyqW19dTifqEmUcIbKJgZyUz0E4Ja79hfllFxRmyM1?=
 =?us-ascii?Q?3YC94TrQE2YJhA/2waXt21PT0BZHG+XuNM4/n/kJbrn+eyeOhl2IKubo6bEB?=
 =?us-ascii?Q?ZfPciwBOEy2uAICxEPzhXNrJ+//IbMXzpJqI2DB5FSZh4uilaDUaqCMJRWCX?=
 =?us-ascii?Q?G8JLFXBdPCWswPLbY7aqz3FI1Ak4CTFZh1D8ImkzPDaFMIypA6w7MyfzNybE?=
 =?us-ascii?Q?+kTfY9y1Q8vkt6gjXJhLSgH3+2QUYBgCJnKoOjX0b3+CQDsCgzaCaEoBrHkQ?=
 =?us-ascii?Q?ju4txECRhQg3etjGct8WHTW04wE14gvdUWlw+NQF6dbBG9HF/aav/o3o2PLe?=
 =?us-ascii?Q?aPZXLWtgzSnr2cEdl3CqTN2o4agb1WBHoigrz/zEi9uAmj7RO+uSQJRguNVT?=
 =?us-ascii?Q?/EQrgpGw2Z7qyb3UGPbsuZgLhplPgXVK0L0/ML9AyE46l5Q5ygF4c2ZeL8Jo?=
 =?us-ascii?Q?sXm2EGONgNKfsQEc9zahLCo+fb7mIwzR6JJP8FYx1YSyxr4qEJ2AMFP1GTvN?=
 =?us-ascii?Q?RfM+yOMZddRi7eg7zCrqJ1fd7KCqbEHyp8xmlDs36ouk5w2G8fbw/RtXdaDc?=
 =?us-ascii?Q?YdFKJpKhu+F7CkhDTv7OSIX6CO4u381uRO8msKmlhVRZFQw4LuRzTSQ8JGDL?=
 =?us-ascii?Q?gzuSZrzgNe748/aH4VFuhwhqymdnDEMfJ49+I1YkkVAlBPpfcBGP3mKpMdxg?=
 =?us-ascii?Q?uKhhUa34PQfhhdCa1tuf9E8dC/6FQJmL32lMR5MhzPKmoWHcBoDTiniu5jSy?=
 =?us-ascii?Q?AC+mKvAqN/o+fgdqwpTH8FMPMYfki8PpfkndqbvDFOCEWZ60858TQkxxlDSh?=
 =?us-ascii?Q?xwPTCFO0eo+vXdFfv4cLa/vnnjGmfqhGVpoqjFG4CXDtlFEE5bTJqeFp+4Yf?=
 =?us-ascii?Q?V9ciSfiAHjkzT0Rlu2YFYnvB0chFuqI2dk79U7QsyTHeeMXlaoYtGcx4opoF?=
 =?us-ascii?Q?cmDJK5y+d0I3BZHbdJEZQ/u+lM01axYbgfwqpB0an/pFOD5+R4zoCYUG9/1a?=
 =?us-ascii?Q?JTqkeh7/XgYoq3OVcRmtC7KlvbvPevlJ/JuF37AKm+pCYCRk/+i+TTdETUnL?=
 =?us-ascii?Q?tBvZrPr/HJz7GuPTDPFuVpwAWlWlMXwPrlz7HQBqJlQieInz4ICPLxGwHsJ0?=
 =?us-ascii?Q?CG75ZLOnzD6Uly83VgOr2TdhtkfsuL5Ey6431s/u6u4V97rGvRUzbNeYgdcy?=
 =?us-ascii?Q?k0rwHgVcbeLhaPOspJV1u2arSumPBY8J0QlCUp5h77ayeCpMsaOZezaHKY0J?=
 =?us-ascii?Q?gyTKs7vri6SKfMia3lDMjD6qetcG5iuQhW65Iujh9sp/iHqTqI9FLCcqfc0W?=
 =?us-ascii?Q?EzXNhG+UI2xqL/XqTLhoUF/4QRJoPxkDPojTI0ofwWYaa30T485GczbiN9+6?=
 =?us-ascii?Q?Hgyi1+p1SALblV22DXxKRE5Xbh4TC8jpPJjuwszyVtSSjJB2W7tNu8GOxTH1?=
 =?us-ascii?Q?giPpFgPXYF+cKOHPQE8CyeWxAEOwF8a9V6qIZ2aLNbLcv1JIF/YBo8Gi3Er5?=
 =?us-ascii?Q?hZLwxHQ6cqZxQFhJAn4RYbWs0PyEmq/Z9K84hV6DrfykF3Mv1XpHawjkuBL5?=
 =?us-ascii?Q?tQ=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56e69b35-74e3-4ca7-316b-08db4f9a0ded
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2023 07:58:48.2122
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /lf+DZPSxpijO0SxjWVD+qmxvLwlbI9paViPNcRrNslPoFH+UUvZBOxRLYeVFzjSm9uibsbYQ3MH6fj9MSkBvpbWiyn4RXwpY29/7Ttj/JY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0201MB8821
X-Proofpoint-GUID: 63nG7JlYBN1FXO4qNr2u5BhQ5uTdL_lN
X-Proofpoint-ORIG-GUID: 63nG7JlYBN1FXO4qNr2u5BhQ5uTdL_lN
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-08_05,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

As there is no need to use DECLARE_WAITQUEUE, use simpler DEFINE_WAIT.

Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
---
 kernel/audit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 89e119ccda76..bcbb0ba33c84 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -640,13 +640,13 @@ static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
 static long wait_for_kauditd(long stime)
 {
 	long rtime;
-	DECLARE_WAITQUEUE(wait, current);
+	DEFINE_WAIT(wait);
 
-	add_wait_queue_exclusive(&audit_backlog_wait, &wait);
-	set_current_state(TASK_UNINTERRUPTIBLE);
+	prepare_to_wait_exclusive(&audit_backlog_wait, &wait,
+				  TASK_UNINTERRUPTIBLE);
 	rtime = schedule_timeout(stime);
 	atomic_add(stime - rtime, &audit_backlog_wait_time_actual);
-	remove_wait_queue(&audit_backlog_wait, &wait);
+	finish_wait(&audit_backlog_wait, &wait);
 
 	return rtime;
 }
-- 
2.40.0