Merge tag 'md-3.7' of git://neil.brown.name/md

[~andy/linux] / fs / nfsd / nfs4proc.c

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index c9c1c0a254170ebc1de0bc70cdcdcce6c8ff5b6d..6c9a4b291dba2c7e44498a32dc46ab6973e922c9 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -370,7 +370,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                        break;
                case NFS4_OPEN_CLAIM_PREVIOUS:
                        open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
-                       status = nfs4_check_open_reclaim(&open->op_clientid);
+                       status = nfs4_check_open_reclaim(&open->op_clientid, cstate->minorversion);
                        if (status)
                                goto out;
                case NFS4_OPEN_CLAIM_FH:
@@ -1054,8 +1054,8 @@ struct nfsd4_operation {
        char *op_name;
        /* Try to get response size before operation */
        nfsd4op_rsize op_rsize_bop;
-       stateid_setter op_get_currentstateid;
-       stateid_getter op_set_currentstateid;
+       stateid_getter op_get_currentstateid;
+       stateid_setter op_set_currentstateid;
 };
 
 static struct nfsd4_operation nfsd4_ops[];