diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 62b3ae280310..4b90e17555a9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -646,7 +646,7 @@ static int _nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state | |||
646 | rcu_read_lock(); | 646 | rcu_read_lock(); |
647 | delegation = rcu_dereference(NFS_I(state->inode)->delegation); | 647 | delegation = rcu_dereference(NFS_I(state->inode)->delegation); |
648 | if (delegation != NULL && (delegation->flags & NFS_DELEGATION_NEED_RECLAIM) != 0) | 648 | if (delegation != NULL && (delegation->flags & NFS_DELEGATION_NEED_RECLAIM) != 0) |
649 | delegation_type = delegation->flags; | 649 | delegation_type = delegation->type; |
650 | rcu_read_unlock(); | 650 | rcu_read_unlock(); |
651 | opendata->o_arg.u.delegation_type = delegation_type; | 651 | opendata->o_arg.u.delegation_type = delegation_type; |
652 | status = nfs4_open_recover(opendata, state); | 652 | status = nfs4_open_recover(opendata, state); |
@@ -1434,7 +1434,7 @@ nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd) | |||
1434 | } | 1434 | } |
1435 | res = d_add_unique(dentry, igrab(state->inode)); | 1435 | res = d_add_unique(dentry, igrab(state->inode)); |
1436 | if (res != NULL) | 1436 | if (res != NULL) |
1437 | dentry = res; | 1437 | path.dentry = res; |
1438 | nfs4_intent_set_file(nd, &path, state); | 1438 | nfs4_intent_set_file(nd, &path, state); |
1439 | return res; | 1439 | return res; |
1440 | } | 1440 | } |