aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-06-05 10:42:27 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-10 23:40:23 -0400
commit88be9f990fe70f0f177ef44a16a477599e91f825 (patch)
treed48ed0c934fc20dc3f7cacfc3b1eca3058246b65 /fs/nfs/inode.c
parentde05a0cc2a2ae16eb8d8dbf88fe728ace45beb9a (diff)
NFS: Replace vfsmount and dentry in nfs_open_context with struct path
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index bd9f5a836592..cc7a9064be90 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -462,8 +462,8 @@ static struct nfs_open_context *alloc_nfs_open_context(struct vfsmount *mnt, str
462 ctx = kmalloc(sizeof(*ctx), GFP_KERNEL); 462 ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
463 if (ctx != NULL) { 463 if (ctx != NULL) {
464 atomic_set(&ctx->count, 1); 464 atomic_set(&ctx->count, 1);
465 ctx->dentry = dget(dentry); 465 ctx->path.dentry = dget(dentry);
466 ctx->vfsmnt = mntget(mnt); 466 ctx->path.mnt = mntget(mnt);
467 ctx->cred = get_rpccred(cred); 467 ctx->cred = get_rpccred(cred);
468 ctx->state = NULL; 468 ctx->state = NULL;
469 ctx->lockowner = current->files; 469 ctx->lockowner = current->files;
@@ -484,7 +484,7 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
484{ 484{
485 if (atomic_dec_and_test(&ctx->count)) { 485 if (atomic_dec_and_test(&ctx->count)) {
486 if (!list_empty(&ctx->list)) { 486 if (!list_empty(&ctx->list)) {
487 struct inode *inode = ctx->dentry->d_inode; 487 struct inode *inode = ctx->path.dentry->d_inode;
488 spin_lock(&inode->i_lock); 488 spin_lock(&inode->i_lock);
489 list_del(&ctx->list); 489 list_del(&ctx->list);
490 spin_unlock(&inode->i_lock); 490 spin_unlock(&inode->i_lock);
@@ -493,8 +493,8 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
493 nfs4_close_state(ctx->state, ctx->mode); 493 nfs4_close_state(ctx->state, ctx->mode);
494 if (ctx->cred != NULL) 494 if (ctx->cred != NULL)
495 put_rpccred(ctx->cred); 495 put_rpccred(ctx->cred);
496 dput(ctx->dentry); 496 dput(ctx->path.dentry);
497 mntput(ctx->vfsmnt); 497 mntput(ctx->path.mnt);
498 kfree(ctx); 498 kfree(ctx);
499 } 499 }
500} 500}