From patchwork Thu Aug 24 14:30:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13364262 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4FD5C6FA8F for ; Thu, 24 Aug 2023 14:31:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233413AbjHXOa7 (ORCPT ); Thu, 24 Aug 2023 10:30:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230012AbjHXOab (ORCPT ); Thu, 24 Aug 2023 10:30:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23679193 for ; Thu, 24 Aug 2023 07:30:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B275960B83 for ; Thu, 24 Aug 2023 14:30:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE4EEC433C8; Thu, 24 Aug 2023 14:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692887429; bh=vG9z68vpATLEXQsIfxJ3Xb9de0Fr67vpSaOkmKK7ATI=; h=Subject:From:To:Cc:Date:From; b=DqbSYUnkGd+hFfd3DyFsGMeoHS1NfRbiktQHjDOBpQE9Tp85VK0UZAKUpOUkADwjg NtLULBrFLQUUaKdhAKe1MSR0WuDwXYZTVLg1FuHM5PE53BIdbPHBWVwgrbAe8g1dLy nXeV7157/6oLeTYTYbUssOcD24lSTOYDJrFlXlDFyZ/r1iL1oXJO3Wz8ycP7Lzjgkj ohLjWiw7CyBjh8BXM+R+WUArVObpfF46kpVB1oGPrR9Dq/NvLDfQ7qLPlJbDyj5WyS uuJU7yrJuVFX3kfS9NFDvkkZRmTcZDmJlSP93D09fMZ1wRJnZtPZHzDHIh60NHbvOH vzVoINj/4yJxQ== Subject: [PATCH] NFSD: Fix a thinko introduced by recent trace point changes From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: kernel test robot , Chuck Lever Date: Thu, 24 Aug 2023 10:30:27 -0400 Message-ID: <169288742767.62637.4868507858344398487.stgit@klimt.1015granger.net> User-Agent: StGit/1.5 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Chuck Lever The fixed commit erroneously removed a call to nfsd_end_grace(), which makes calls to write_v4_end_grace() a no-op. Fixes: 39d432fc7630 ("NFSD: trace nfsctl operations") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202308241229.68396422-oliver.sang@intel.com Signed-off-by: Chuck Lever Reviewed-by: Jeff Layton --- fs/nfsd/nfsctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 1b8b1aab9a15..4302ca0ff6ed 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1105,6 +1105,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size) if (!nn->nfsd_serv) return -EBUSY; trace_nfsd_end_grace(netns(file)); + nfsd4_end_grace(nn); break; default: return -EINVAL;