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

Commit 651b0e70 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Do not aggressively cache file attributes in the case of O_DIRECT 



A file that is open for O_DIRECT is by definition not obeying
close-to-open cache consistency semantics, so let's not cache
the attributes too aggressively either.

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

fs/nfs/inode.c

+7 −2
Original line number Diff line number Diff line
@@ -1214,6 +1214,11 @@ static bool nfs_file_has_writers(struct nfs_inode *nfsi) 
			list)->mode & FMODE_WRITE) == FMODE_WRITE;

}



static bool nfs_file_has_buffered_writers(struct nfs_inode *nfsi)

{

	return nfs_file_has_writers(nfsi) && nfs_file_io_is_buffered(nfsi);

}



static unsigned long nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)

{

	struct nfs_inode *nfsi = NFS_I(inode);
@@ -1278,7 +1283,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
	if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT))

		return -EIO;



	if (!nfs_file_has_writers(nfsi)) {

	if (!nfs_file_has_buffered_writers(nfsi)) {

		/* Verify a few of the more important attributes */

		if ((fattr->valid & NFS_ATTR_FATTR_CHANGE) != 0 && inode->i_version != fattr->change_attr)

			invalid |= NFS_INO_INVALID_ATTR | NFS_INO_REVAL_PAGECACHE;
@@ -1660,7 +1665,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	unsigned long invalid = 0;

	unsigned long now = jiffies;

	unsigned long save_cache_validity;

	bool have_writers = nfs_file_has_writers(nfsi);

	bool have_writers = nfs_file_has_buffered_writers(nfsi);

	bool cache_revalidated = true;



	dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",

fs/nfs/internal.h

+5 −0
Original line number Diff line number Diff line
@@ -419,6 +419,11 @@ extern void nfs_end_io_write(struct inode *inode); 
extern void nfs_start_io_direct(struct inode *inode);

extern void nfs_end_io_direct(struct inode *inode);



static inline bool nfs_file_io_is_buffered(struct nfs_inode *nfsi)

{

	return test_bit(NFS_INO_ODIRECT, &nfsi->flags) == 0;

}



/* namespace.c */

#define NFS_PATH_CANONICAL 1

extern char *nfs_path(char **p, struct dentry *dentry,