git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
nfsd
/
nfscache.c
diff --git
a/fs/nfsd/nfscache.c
b/fs/nfsd/nfscache.c
index
608a197
..
9ab14f5
100644
(file)
--- a/
fs/nfsd/nfscache.c
+++ b/
fs/nfsd/nfscache.c
@@
-41,7
+41,7
@@
static struct svc_cacherep * lru_tail;
static struct svc_cacherep * nfscache;
static int cache_disabled = 1;
static struct svc_cacherep * nfscache;
static int cache_disabled = 1;
-static int nfsd_cache_append(struct svc_rqst *rqstp, struct
io
vec *vec);
+static int nfsd_cache_append(struct svc_rqst *rqstp, struct
k
vec *vec);
/*
* locking for the reply cache:
/*
* locking for the reply cache:
@@
-308,7
+308,7
@@
void
nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, u32 *statp)
{
struct svc_cacherep *rp;
nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, u32 *statp)
{
struct svc_cacherep *rp;
- struct
iovec
*resv = &rqstp->rq_res.head[0], *cachv;
+ struct
kvec
*resv = &rqstp->rq_res.head[0], *cachv;
int len;
if (!(rp = rqstp->rq_cacherep) || cache_disabled)
int len;
if (!(rp = rqstp->rq_cacherep) || cache_disabled)
@@
-358,9
+358,9
@@
nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, u32 *statp)
* keep a refcount....
*/
static int
* keep a refcount....
*/
static int
-nfsd_cache_append(struct svc_rqst *rqstp, struct
io
vec *data)
+nfsd_cache_append(struct svc_rqst *rqstp, struct
k
vec *data)
{
{
- struct
iovec
*vec = &rqstp->rq_res.head[0];
+ struct
kvec
*vec = &rqstp->rq_res.head[0];
if (vec->iov_len + data->iov_len > PAGE_SIZE) {
printk(KERN_WARNING "nfsd: cached reply too large (%Zd).\n",
if (vec->iov_len + data->iov_len > PAGE_SIZE) {
printk(KERN_WARNING "nfsd: cached reply too large (%Zd).\n",