Commit 45f3a70b authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Trond Myklebust
Browse files

NFS: Cleanup usage of nfs_inode in fscache interface 



A number of places in the fscache interface used nfs_inode when inode could
be used, simplifying the code.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent b4be2c59

fs/nfs/fscache.c

+4 −6
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void nfs_fscache_init_inode(struct inode *inode) 
	if (!(nfss->fscache && S_ISREG(inode->i_mode)))

		return;



	nfs_fscache_update_auxdata(&auxdata, nfsi);

	nfs_fscache_update_auxdata(&auxdata, inode);



	nfsi->fscache = fscache_acquire_cookie(NFS_SB(inode->i_sb)->fscache,

					       0,
@@ -181,7 +181,7 @@ void nfs_fscache_init_inode(struct inode *inode) 
					       nfsi->fh.size,

					       &auxdata,      /* aux_data */

					       sizeof(auxdata),

					       i_size_read(&nfsi->vfs_inode));

					       i_size_read(inode));

}



/*
@@ -220,7 +220,6 @@ void nfs_fscache_clear_inode(struct inode *inode) 
void nfs_fscache_open_file(struct inode *inode, struct file *filp)

{

	struct nfs_fscache_inode_auxdata auxdata;

	struct nfs_inode *nfsi = NFS_I(inode);

	struct fscache_cookie *cookie = nfs_i_fscache(inode);

	bool open_for_write = inode_is_open_for_write(inode);
@@ -230,7 +229,7 @@ void nfs_fscache_open_file(struct inode *inode, struct file *filp) 
	fscache_use_cookie(cookie, open_for_write);

	if (open_for_write) {

		dfprintk(FSCACHE, "NFS: nfsi 0x%p disabling cache\n", nfsi);

		nfs_fscache_update_auxdata(&auxdata, nfsi);

		nfs_fscache_update_auxdata(&auxdata, inode);

		fscache_invalidate(cookie, &auxdata, i_size_read(inode),

				   FSCACHE_INVAL_DIO_WRITE);

	}
@@ -240,11 +239,10 @@ EXPORT_SYMBOL_GPL(nfs_fscache_open_file); 
void nfs_fscache_release_file(struct inode *inode, struct file *filp)

{

	struct nfs_fscache_inode_auxdata auxdata;

	struct nfs_inode *nfsi = NFS_I(inode);

	struct fscache_cookie *cookie = nfs_i_fscache(inode);



	if (fscache_cookie_valid(cookie)) {

		nfs_fscache_update_auxdata(&auxdata, nfsi);

		nfs_fscache_update_auxdata(&auxdata, inode);

		fscache_unuse_cookie(cookie, &auxdata, NULL);

	}

}

fs/nfs/fscache.h

+9 −9
Original line number Diff line number Diff line
@@ -86,16 +86,16 @@ static inline void nfs_readpage_to_fscache(struct inode *inode, 
}



static inline void nfs_fscache_update_auxdata(struct nfs_fscache_inode_auxdata *auxdata,

					      struct nfs_inode *nfsi)

					      struct inode *inode)

{

	memset(auxdata, 0, sizeof(*auxdata));

	auxdata->mtime_sec  = nfsi->vfs_inode.i_mtime.tv_sec;

	auxdata->mtime_nsec = nfsi->vfs_inode.i_mtime.tv_nsec;

	auxdata->ctime_sec  = nfsi->vfs_inode.i_ctime.tv_sec;

	auxdata->ctime_nsec = nfsi->vfs_inode.i_ctime.tv_nsec;

	auxdata->mtime_sec  = inode->i_mtime.tv_sec;

	auxdata->mtime_nsec = inode->i_mtime.tv_nsec;

	auxdata->ctime_sec  = inode->i_ctime.tv_sec;

	auxdata->ctime_nsec = inode->i_ctime.tv_nsec;



	if (NFS_SERVER(&nfsi->vfs_inode)->nfs_client->rpc_ops->version == 4)

		auxdata->change_attr = inode_peek_iversion_raw(&nfsi->vfs_inode);

	if (NFS_SERVER(inode)->nfs_client->rpc_ops->version == 4)

		auxdata->change_attr = inode_peek_iversion_raw(inode);

}



/*
@@ -107,9 +107,9 @@ static inline void nfs_fscache_invalidate(struct inode *inode, int flags) 
	struct nfs_inode *nfsi = NFS_I(inode);



	if (nfsi->fscache) {

		nfs_fscache_update_auxdata(&auxdata, nfsi);

		nfs_fscache_update_auxdata(&auxdata, inode);

		fscache_invalidate(nfsi->fscache, &auxdata,

				   i_size_read(&nfsi->vfs_inode), flags);

				   i_size_read(inode), flags);

	}

}