aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:40 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:41 -0500
commit01cce933d8b524d9312f5098c70fa1b6ac190572 (patch)
tree7601e02e874a6eb44faca3cdf06664c7377ac687 /fs/nfs/inode.c
parent2485822d51f8b338d289abe00eb7ce5249794a08 (diff)
[PATCH] nfs: change uses of f_{dentry,vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the nfs client code. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 36680d1061b0..63e470279309 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -496,7 +496,7 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
496 */ 496 */
497static void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx) 497static void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)
498{ 498{
499 struct inode *inode = filp->f_dentry->d_inode; 499 struct inode *inode = filp->f_path.dentry->d_inode;
500 struct nfs_inode *nfsi = NFS_I(inode); 500 struct nfs_inode *nfsi = NFS_I(inode);
501 501
502 filp->private_data = get_nfs_open_context(ctx); 502 filp->private_data = get_nfs_open_context(ctx);
@@ -528,7 +528,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_c
528 528
529static void nfs_file_clear_open_context(struct file *filp) 529static void nfs_file_clear_open_context(struct file *filp)
530{ 530{
531 struct inode *inode = filp->f_dentry->d_inode; 531 struct inode *inode = filp->f_path.dentry->d_inode;
532 struct nfs_open_context *ctx = (struct nfs_open_context *)filp->private_data; 532 struct nfs_open_context *ctx = (struct nfs_open_context *)filp->private_data;
533 533
534 if (ctx) { 534 if (ctx) {
@@ -551,7 +551,7 @@ int nfs_open(struct inode *inode, struct file *filp)
551 cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0); 551 cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0);
552 if (IS_ERR(cred)) 552 if (IS_ERR(cred))
553 return PTR_ERR(cred); 553 return PTR_ERR(cred);
554 ctx = alloc_nfs_open_context(filp->f_vfsmnt, filp->f_dentry, cred); 554 ctx = alloc_nfs_open_context(filp->f_path.mnt, filp->f_path.dentry, cred);
555 put_rpccred(cred); 555 put_rpccred(cred);
556 if (ctx == NULL) 556 if (ctx == NULL)
557 return -ENOMEM; 557 return -ENOMEM;