Merge branch 'nfsv41_cb'

* nfsv41_cb:
  NFSv4.x: Fix NFS4ERR_RETRY_UNCACHED_REP in nfs4_callback_sequence
  NFSv4.x: Allow multiple callbacks in flight
  NFSv4.x: Fix wraparound issues when validing the callback sequence id
  NFSv4.x: Enforce the ca_maxresponsesize_cached on the back channel
  NFSv4.x: CB_SEQUENCE should return NFS4ERR_DELAY if still executing
  NFSv4.x: Remove hard coded slotids in callback channel

diff --combined fs/nfs/nfs4proc.c
index 14881594dd07b9944a494d388722f4acf4b5457a,be685e236bd53b6f6644f77c41e6b170c46a7858..1e103b4f4ad74e24db95fe891b6e820b4df6092d
--- 1/fs/nfs/nfs4proc.c
--- 2/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -2466,9 -2466,9 +2466,9 @@@ static int _nfs4_open_and_get_state(str
                dentry = d_add_unique(dentry, igrab(state->inode));
                if (dentry == NULL) {
                        dentry = opendata->dentry;
 -              } else if (dentry != ctx->dentry) {
 +              } else {
                        dput(ctx->dentry);
 -                      ctx->dentry = dget(dentry);
 +                      ctx->dentry = dentry;
                }
                nfs_set_verifier(dentry,
                                nfs_save_change_attribute(d_inode(opendata->dir)));
@@@ -7319,7 -7319,7 +7319,7 @@@ static void nfs4_init_channel_attrs(str
        args->bc_attrs.max_resp_sz = PAGE_SIZE;
        args->bc_attrs.max_resp_sz_cached = 0;
        args->bc_attrs.max_ops = NFS4_MAX_BACK_CHANNEL_OPS;
-       args->bc_attrs.max_reqs = 1;
+       args->bc_attrs.max_reqs = NFS41_BC_MAX_CALLBACKS;
  
        dprintk("%s: Back Channel : max_rqst_sz=%u max_resp_sz=%u "
                "max_resp_sz_cached=%u max_ops=%u max_reqs=%u\n",