From ea8aafc84c9185ec354264748fda6778be73ac7b Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 18 Mar 2013 12:50:59 -0400 Subject: [PATCH] --- yaml --- r: 367285 b: refs/heads/master c: ccb46e2063fe0816c3f28a8d328a9bbac7e88648 h: refs/heads/master i: 367283: 74e377ebbd959e47bd48d0c3b75b11c0dfaeee77 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab700f59a4f1..105b7c4230c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49f9a0fafd844c32f2abada047c0b9a5ba0d6255 +refs/heads/master: ccb46e2063fe0816c3f28a8d328a9bbac7e88648 diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 732b76f703d6..06e5a72b5fa2 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -1383,7 +1383,7 @@ static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs int ret; opendata = nfs4_open_recoverdata_alloc(ctx, state, - NFS4_OPEN_CLAIM_DELEGATE_CUR); + NFS4_OPEN_CLAIM_DELEG_CUR_FH); if (IS_ERR(opendata)) return PTR_ERR(opendata); nfs4_stateid_copy(&opendata->o_arg.u.delegation, stateid);