epoll: add syscall epoll_pwait2

[linux-2.6-microblaze.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d7f27ed..1d2cd6a 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -769,6 +769,7 @@ static int nfs4_init_cp_state(struct nfsd_net *nn, copy_stateid_t *stid,
        spin_lock(&nn->s2s_cp_lock);
        new_id = idr_alloc_cyclic(&nn->s2s_cp_stateids, stid, 0, 0, GFP_NOWAIT);
        stid->stid.si_opaque.so_id = new_id;
+       stid->stid.si_generation = 1;
        spin_unlock(&nn->s2s_cp_lock);
        idr_preload_end();
        if (new_id < 0)
@@ -3066,7 +3067,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
        rpc_ntop(sa, addr_str, sizeof(addr_str));
        dprintk("%s rqstp=%p exid=%p clname.len=%u clname.data=%p "
-               "ip_addr=%s flags %x, spa_how %d\n",
+               "ip_addr=%s flags %x, spa_how %u\n",
                __func__, rqstp, exid, exid->clname.len, exid->clname.data,
                addr_str, exid->flags, exid->spa_how);