diff --git a/[refs] b/[refs] index 12efe2811e76..285db9cad13a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dc8889589678c228a675b9f01721318a31a8f5b +refs/heads/master: 09662d58d5a2d75c8c29558dda4fc5134ef14b25 diff --git a/trunk/fs/nfsd/cache.h b/trunk/fs/nfsd/cache.h index 2cac76c63b97..f8c6df8649dc 100644 --- a/trunk/fs/nfsd/cache.h +++ b/trunk/fs/nfsd/cache.h @@ -50,8 +50,7 @@ enum { enum { RC_DROPIT, RC_REPLY, - RC_DOIT, - RC_INTR + RC_DOIT }; /* diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c index cee62ab9d4a3..40cb1cbaba4e 100644 --- a/trunk/fs/nfsd/nfssvc.c +++ b/trunk/fs/nfsd/nfssvc.c @@ -652,7 +652,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) /* Check whether we have this call in the cache. */ switch (nfsd_cache_lookup(rqstp)) { - case RC_INTR: case RC_DROPIT: return 0; case RC_REPLY: