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 v2 3/5] audit: convert DECLARE_WAITQUEUE to DEFINE_WAIT
Date:   Thu, 11 May 2023 05:21:14 +0000
Message-Id: <20230511052116.19452-4-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230511052116.19452-1-eiichi.tsukata@nutanix.com>
References: <20230511052116.19452-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?ts1SZ8ulNxidivU6chHYjUEBGr5jjsmc1a+KwkyQrIMtMHeXt2L4vvAMRTly?=
 =?us-ascii?Q?KPh3UhLoIWXoFHHnO76D7vX4XiYcVzOcxH6YAi2VtmNS0hsWVjYf0jl7/dQM?=
 =?us-ascii?Q?Qe9zP4WJfFlnGeBLe8AOXJsZZUcPK7PXr4uPL5kppW9OYzOMAZVbX2Clsd+P?=
 =?us-ascii?Q?d4RPZIr5OR0zWUobMWvYKMg4eqj/dyd6q+5pve2pB5/2mnCKzbElRvErOmGg?=
 =?us-ascii?Q?IcVSnVxw43ubzd0cnWwsYxS6aeZFltEMUrbAoiZEU/mb7IKb2TNQv+JuxZkx?=
 =?us-ascii?Q?5EkUMf1jhaF0+DhIlHvo3VgJIijOA1fjaBnfNYxip3bIOsfGbKQ/Z67Pw8sM?=
 =?us-ascii?Q?cACV0OqNx7nvHOihEVK814rwvDbxJ74OKHlX3/KL5t0p4N+5nvW8tVAPk1Dm?=
 =?us-ascii?Q?3JeH6kdTQ32LjPnW7ec1R1y0/MZR8LfqvfnN+Z01EIlYNrWuhxggDxp7VbTH?=
 =?us-ascii?Q?xfze62MxH24oPO9bPCOEijgCLUW6CrG0boSceKLul972NEwExxwEN670O2ag?=
 =?us-ascii?Q?8peCuirI+5auWIGLaG1cwG6DHTMN3EUPVjHWnLLqcMmvObpdT0I/PmR097oT?=
 =?us-ascii?Q?+iujSxTJMdz3xCa9tz4IdNsdCgGEgdaU33jLx4Wso98oPF9fS7cttFfnEXwu?=
 =?us-ascii?Q?x6NAB94zlOsHQUVK3s1MXEt4+vNyiKZop2opUQCgBN6fJgLjW7SCrcDkMtdW?=
 =?us-ascii?Q?0H3WrjL6dbvmDhnb97IeXEEtf+rkB2SP04A1BIhqv8HyVgPFyRNp8mMUC/FG?=
 =?us-ascii?Q?dX8Bsie14NR3kHpi67Bp4C1IKrR44TnQwaLsq+9XiI4zUCf7lkF2YX+F5hmA?=
 =?us-ascii?Q?TXEHr7PBQNzXHk1dUSp41W4CEaIcnwJ9FFqtOrr+M2dbsP4JOStpCOfmvWAu?=
 =?us-ascii?Q?tD1estuHSgLVAjA7hqcdKiTz7UGw7ac2KknK8PX4lA/FfNBH2ZCWTAx3hSVJ?=
 =?us-ascii?Q?wd51wAssozcp/mxU8hFLqVSicy6pEFqJyCm/eHecSkvDsKbZK1ZCfDoj6+R6?=
 =?us-ascii?Q?XDQB6iMhZJOC3qHO6iWNWg6kF/yw7xhhLaWCWQ0ZmtYXiwnQGx1jkeEq+j6F?=
 =?us-ascii?Q?OrcBHP5GhPLI899SSbCMxKDrn3qTyE2Mvfdn3oKe4rYOoyIRngiG3yL0RaLT?=
 =?us-ascii?Q?HLjx/KEt92QCe67AwQjTe0Goy0+G8DtDIhRml9rwy8rRPbdiGUnpNHQWixPT?=
 =?us-ascii?Q?XwTlEOh7WzyJklHNmYh5+Aggmnc27gKxyhwHPqI22dUP5MAgLxYSGXbkdZXm?=
 =?us-ascii?Q?hxRZktvKeB+RFyy5FD9TL/05P/V6qI9Qt20Q+JQfIllW38fRCPXK5MvYJU3u?=
 =?us-ascii?Q?ClUiN7L0F2e+xT/qpMipthfc4YWYiO2f4rHodlTKvEDlHbQI5XbaYwhkKqoi?=
 =?us-ascii?Q?iIcp/8gL0bK3VL1gnz1/VhlJ0RDbH+gylF/OXunbgaUbD6dY2daFXpANXQ8s?=
 =?us-ascii?Q?DGKT9lqlMWK29snbNt0JuiFvchT5qkDGi2n/d5XruCHXZl5SZUJ9aC4eWabW?=
 =?us-ascii?Q?+OG7i1ZzYcmvfAebXKw2OzlgelPMjWN3xUnGhpYKOckA7vOzdsZ+7Hv5anaS?=
 =?us-ascii?Q?L6SG3+IR22Pv89za5FpiD4wWGvaMcguihooujGl1nZtTNhO2pdAz9hlaFF3V?=
 =?us-ascii?Q?Dg=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 224db04e-07b0-4e18-aecf-08db51df94bf
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 05:21:32.0433
 (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: t8TFZwA0McWm2RO4Ag91R+TNdO5RVMpgBEwP2+5sbzWoZ0Ykfeh461YvkUBGGpd1yeWyRatQ3LWx8CSW1NEQLWWae5Yi4hQonVPf+2CvCEA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR02MB10006
X-Proofpoint-ORIG-GUID: 4cHUNpz9ONHELrYwMCm1rTV5MLw7j-mX
X-Proofpoint-GUID: 4cHUNpz9ONHELrYwMCm1rTV5MLw7j-mX
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-10_04,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