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

Commit c4812998 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Fix atime revalidation in readdir() 



NFSv3 will correctly update atime on a readdir call, so there is no need to
set the NFS_INO_INVALID_ATIME flag unless the call to nfs_refresh_inode()
fails.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 57fa76f2

fs/nfs/dir.c

+0 −6
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) 
	desc->timestamp = timestamp;

	desc->timestamp_valid = 1;

	SetPageUptodate(page);

	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME;

	spin_unlock(&inode->i_lock);

	/* Ensure consistent page alignment of the data.

	 * Note: assumes we have exclusive access to this mapping either

	 *	 through inode->i_mutex or some other mechanism.
@@ -490,9 +487,6 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
						page,

						NFS_SERVER(inode)->dtsize,

						desc->plus);

	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME;

	spin_unlock(&inode->i_lock);

	desc->page = page;

	desc->ptr = kmap(page);		/* matching kunmap in nfs_do_filldir */

	if (desc->error >= 0) {

fs/nfs/inode.c

+7 −0
Original line number Diff line number Diff line
@@ -156,6 +156,13 @@ static void nfs_zap_acl_cache(struct inode *inode) 
	spin_unlock(&inode->i_lock);

}



void nfs_invalidate_atime(struct inode *inode)

{

	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATIME;

	spin_unlock(&inode->i_lock);

}



/*

 * Invalidate, but do not unhash, the inode.

 * NB: must be called with inode->i_lock held!

fs/nfs/nfs3proc.c

+3 −0
Original line number Diff line number Diff line
@@ -607,6 +607,9 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, 


	nfs_fattr_init(&dir_attr);

	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);



	nfs_invalidate_atime(dir);



	nfs_refresh_inode(dir, &dir_attr);

	dprintk("NFS reply readdir: %d\n", status);

	return status;

fs/nfs/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -2197,6 +2197,9 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, 
	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);

	if (status == 0)

		memcpy(NFS_COOKIEVERF(dir), res.verifier.data, NFS4_VERIFIER_SIZE);



	nfs_invalidate_atime(dir);



	dprintk("%s: returns %d\n", __FUNCTION__, status);

	return status;

}

fs/nfs/proc.c

+2 −0
Original line number Diff line number Diff line
@@ -476,6 +476,8 @@ nfs_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, 
	dprintk("NFS call  readdir %d\n", (unsigned int)cookie);

	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);



	nfs_invalidate_atime(dir);



	dprintk("NFS reply readdir: %d\n", status);

	return status;

}