Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 187e593d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Clean up nfs_attribute_timeout() 



It can be made static.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 3f642a13

fs/nfs/inode.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -160,6 +160,13 @@ int nfs_sync_mapping(struct address_space *mapping) 
	return ret;

	return ret;

}

}





static int nfs_attribute_timeout(struct inode *inode)

{

	struct nfs_inode *nfsi = NFS_I(inode);



	return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);

}



static bool nfs_check_cache_invalid_delegated(struct inode *inode, unsigned long flags)

static bool nfs_check_cache_invalid_delegated(struct inode *inode, unsigned long flags)

{

{

	unsigned long cache_validity = READ_ONCE(NFS_I(inode)->cache_validity);

	unsigned long cache_validity = READ_ONCE(NFS_I(inode)->cache_validity);
@@ -1076,13 +1083,6 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
	return status;

	return status;

}

}





int nfs_attribute_timeout(struct inode *inode)

{

	struct nfs_inode *nfsi = NFS_I(inode);



	return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);

}



int nfs_attribute_cache_expired(struct inode *inode)

int nfs_attribute_cache_expired(struct inode *inode)

{

{

	if (nfs_have_delegated_attributes(inode))

	if (nfs_have_delegated_attributes(inode))

include/linux/nfs_fs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,6 @@ extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *); 
extern void nfs_access_set_mask(struct nfs_access_entry *, u32);

extern void nfs_access_set_mask(struct nfs_access_entry *, u32);

extern int nfs_permission(struct inode *, int);

extern int nfs_permission(struct inode *, int);

extern int nfs_open(struct inode *, struct file *);

extern int nfs_open(struct inode *, struct file *);

extern int nfs_attribute_timeout(struct inode *inode);

extern int nfs_attribute_cache_expired(struct inode *inode);

extern int nfs_attribute_cache_expired(struct inode *inode);

extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);

extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);

extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);

extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);