Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

NFS: return void from nfs4_inode_make_writeable

None of the callers checks the return value, so drop it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>

authored by

Christoph Hellwig and committed by
Anna Schumaker
d37272c6 7537db24

+4 -8
+3 -7
fs/nfs/delegation.c
··· 912 912 * @inode: pointer to inode 913 913 * 914 914 * Make the inode writeable by returning the delegation if necessary 915 - * 916 - * Returns zero on success, or a negative errno value. 917 915 */ 918 - int nfs4_inode_make_writeable(struct inode *inode) 916 + void nfs4_inode_make_writeable(struct inode *inode) 919 917 { 920 918 struct nfs_delegation *delegation; 921 - int error = 0; 922 919 923 920 delegation = nfs4_get_valid_delegation(inode); 924 921 if (!delegation) 925 - return 0; 922 + return; 926 923 927 924 if (!nfs4_has_session(NFS_SERVER(inode)->nfs_client) || 928 925 !(delegation->type & FMODE_WRITE)) 929 - error = nfs4_inode_return_delegation(inode); 926 + nfs4_inode_return_delegation(inode); 930 927 nfs_put_delegation(delegation); 931 - return error; 932 928 } 933 929 934 930 static void
+1 -1
fs/nfs/delegation.h
··· 87 87 bool nfs4_delegation_flush_on_close(const struct inode *inode); 88 88 void nfs_inode_find_delegation_state_and_recover(struct inode *inode, 89 89 const nfs4_stateid *stateid); 90 - int nfs4_inode_make_writeable(struct inode *inode); 90 + void nfs4_inode_make_writeable(struct inode *inode); 91 91 92 92 #endif 93 93