From c25d96283ad62227973b21662a398095a15995e6 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 18 Jan 2006 17:43:14 -0800 Subject: [PATCH] --- yaml --- r: 18944 b: refs/heads/master c: 7e8f05934d540aeb45c1cc3cc3a0e811bd61866b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/vfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5db66127b2d..b6805a7cbb84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f193fbab2e4710f629e7c1859d4908646b47b126 +refs/heads/master: 7e8f05934d540aeb45c1cc3cc3a0e811bd61866b diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c index acf637869ccf..6acec3416763 100644 --- a/trunk/fs/nfsd/vfs.c +++ b/trunk/fs/nfsd/vfs.c @@ -815,7 +815,7 @@ nfsd_read_actor(read_descriptor_t *desc, struct page *page, unsigned long offset return size; } -static inline int +static int nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, struct kvec *vec, int vlen, unsigned long *count) { @@ -879,7 +879,7 @@ static void kill_suid(struct dentry *dentry) mutex_unlock(&dentry->d_inode->i_mutex); } -static inline int +static int nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, loff_t offset, struct kvec *vec, int vlen, unsigned long cnt, int *stablep)