From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD26D285C80 for ; Wed, 28 Jan 2026 04:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769575636; cv=none; b=Q6rf4YNrHWIuc7r0lg0cxunJOotOBvDDEQqW/62NviKOT9PQiic/chu5LjYYK1Pc0HZ5ETM84ukCGEkNot9bQF2lBVEuv2R5rSp5rjCX2QYn2dNsQ8hpytV6Yy/GgfH9URjNyMmHob20PKT8lAKxDLzaQ5qwEYJBRbWRQLEEXGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769575636; c=relaxed/simple; bh=L1hcc2gk+XNrjfLzdHcjOX2lxWUMZDvK9jwS5Tsueag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V6oiB7jqQC7uLtSVbB4R2bm4n8IYZ5RGmACfmtXGtpv1Hq3TXbaMdobx5yxXOVRpwtLLiw3KJeBge6Pg8VDVE2fRV9uh+KSbGSeFIg7yn9qMZzCBCncmnfGfyGe+bPjRaPK5Rs4zUBYVnUdn9c4kX9zDxfHn5Z5jevLnf8TCDyU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=Yi8FnsM1; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Yi8FnsM1" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=v8GeJY+gaU7AeKyDxx4uj4aLlB/zusyAS/z3bANqCzU=; b=Yi8FnsM1FTd6GHL6GrEO+w7EjK s4KyXE2qmkT5aLcjW9BOogG4uYkdwJPuW27h+OFbf8DDbnM5nqdBVhM5Im5VCm7WeXeXNa/X9nIiO pXbb/1yvZKUWqHYhEF2XZ2mOBukyi9cePsts35kjtaRuum67AsaycqKVZ4XZWnoa9QHkevyBxMRr4 4oGYhrPWF+sJghuyuJek2gNCt3VsklWs3Bc+IX2JoVSDw8EQrCuAFx0mnVLSOGifAHbMk2a2Gs1uS T8dcH08ISn1Urj8spe4c7TrvbRzwHCZ12CXAwDKJm+5WBX9to9de9sGTW5yL/C4AHws/Z5gR6jvWq Z7nF16Fg==; Received: from 2a02-8389-2341-5b80-d601-7564-c2e0-491c.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:d601:7564:c2e0:491c] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1vkxSU-0000000FRGb-3QWG; Wed, 28 Jan 2026 04:47:15 +0000 From: Christoph Hellwig To: Trond Myklebust , Anna Schumaker Cc: Chris Mason , linux-nfs@vger.kernel.org Subject: [PATCH 1/7] NFS: return void from nfs4_inode_make_writeable Date: Wed, 28 Jan 2026 05:46:03 +0100 Message-ID: <20260128044706.556046-2-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260128044706.556046-1-hch@lst.de> References: <20260128044706.556046-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html None of the callers checks the return value, so drop it. Signed-off-by: Christoph Hellwig --- fs/nfs/delegation.c | 10 +++------- fs/nfs/delegation.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 4d5f1f3162b0..c77c7b2d5877 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -912,23 +912,19 @@ void nfs4_inode_return_delegation_on_close(struct inode *inode) * @inode: pointer to inode * * Make the inode writeable by returning the delegation if necessary - * - * Returns zero on success, or a negative errno value. */ -int nfs4_inode_make_writeable(struct inode *inode) +void nfs4_inode_make_writeable(struct inode *inode) { struct nfs_delegation *delegation; - int error = 0; delegation = nfs4_get_valid_delegation(inode); if (!delegation) - return 0; + return; if (!nfs4_has_session(NFS_SERVER(inode)->nfs_client) || !(delegation->type & FMODE_WRITE)) - error = nfs4_inode_return_delegation(inode); + nfs4_inode_return_delegation(inode); nfs_put_delegation(delegation); - return error; } static void diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h index a6733f034442..d30f19a28077 100644 --- a/fs/nfs/delegation.h +++ b/fs/nfs/delegation.h @@ -87,7 +87,7 @@ int nfs4_check_delegation(struct inode *inode, fmode_t type); bool nfs4_delegation_flush_on_close(const struct inode *inode); void nfs_inode_find_delegation_state_and_recover(struct inode *inode, const nfs4_stateid *stateid); -int nfs4_inode_make_writeable(struct inode *inode); +void nfs4_inode_make_writeable(struct inode *inode); #endif -- 2.47.3