+3 -5

fs/nfs/delegation.c

reviewed

··· 814 814 * 815 815 * Returns zero on success, or a negative errno value. 816 816 */ 817 817 - int nfs4_inode_return_delegation(struct inode *inode) 817 817 + void nfs4_inode_return_delegation(struct inode *inode) 818 818 { 819 819 struct nfs_inode *nfsi = NFS_I(inode); 820 820 struct nfs_delegation *delegation; 821 821 - int err; 822 821 823 822 delegation = nfs_start_delegation_return(nfsi); 824 823 if (!delegation) 825 825 - return 0; 824 824 + return; 826 825 827 826 /* Synchronous recall of any application leases */ 828 827 break_lease(inode, O_WRONLY | O_RDWR); 829 828 if (S_ISREG(inode->i_mode)) 830 829 nfs_wb_all(inode); 831 831 - err = nfs_end_delegation_return(inode, delegation, 1); 830 830 + nfs_end_delegation_return(inode, delegation, 1); 832 831 nfs_put_delegation(delegation); 833 833 - return err; 834 832 } 835 833 836 834 /**

+1 -1

fs/nfs/delegation.h

reviewed

··· 47 47 void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred, 48 48 fmode_t type, const nfs4_stateid *stateid, 49 49 unsigned long pagemod_limit, u32 deleg_type); 50 50 - int nfs4_inode_return_delegation(struct inode *inode); 50 50 + void nfs4_inode_return_delegation(struct inode *inode); 51 51 void nfs4_inode_return_delegation_on_close(struct inode *inode); 52 52 void nfs4_inode_set_return_delegation_on_close(struct inode *inode); 53 53 int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);

+1 -2

fs/nfs/nfs3proc.c

reviewed

··· 1027 1027 return 0; 1028 1028 } 1029 1029 1030 1030 - static int nfs3_return_delegation(struct inode *inode) 1030 1030 + static void nfs3_return_delegation(struct inode *inode) 1031 1031 { 1032 1032 if (S_ISREG(inode->i_mode)) 1033 1033 nfs_wb_all(inode); 1034 1034 - return 0; 1035 1034 } 1036 1035 1037 1036 static const struct inode_operations nfs3_dir_inode_operations = {

+1 -2

fs/nfs/proc.c

reviewed

··· 697 697 return 0; 698 698 } 699 699 700 700 - static int nfs_return_delegation(struct inode *inode) 700 700 + static void nfs_return_delegation(struct inode *inode) 701 701 { 702 702 if (S_ISREG(inode->i_mode)) 703 703 nfs_wb_all(inode); 704 704 - return 0; 705 704 } 706 705 707 706 static const struct inode_operations nfs_dir_inode_operations = {

+1 -1

include/linux/nfs_xdr.h

reviewed

··· 1846 1846 struct iattr *iattr, 1847 1847 int *); 1848 1848 int (*have_delegation)(struct inode *, fmode_t, int); 1849 1849 - int (*return_delegation)(struct inode *); 1849 1849 + void (*return_delegation)(struct inode *); 1850 1850 struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *); 1851 1851 struct nfs_client *(*init_client) (struct nfs_client *, 1852 1852 const struct nfs_client_initdata *);