From d37272c62a08b5fc74bedf7b560f794a84b7cdf1 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 28 Jan 2026 05:46:03 +0100 Subject: [PATCH] NFS: return void from nfs4_inode_make_writeable None of the callers checks the return value, so drop it. Signed-off-by: Christoph Hellwig Signed-off-by: Anna Schumaker --- 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 4d5f1f3162b08..c77c7b2d58774 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 a6733f034442b..d30f19a280775 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