aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChuck Lever <cel@netapp.com>2006-03-20 13:44:29 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 13:44:29 -0500
commit5dd602f20688e08c85ac91e0451c4e6321ed25d7 (patch)
treee89a89d68ec0fcdc6fd18570c0df9daa15e23902 /fs/nfs
parentd4cc948ba97980c55a308eab167a695109796456 (diff)
NFS: use size_t type for holding rsize bytes in NFS O_DIRECT read path
size_t is used for holding byte counts, so use it for variables storing rsize. Note that the write path will be updated as we add support for async O_DIRECT writes. Test plan: Need to verify that existing comparisons against new size_t variables behave correctly. Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/direct.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index d38c3dc052a7..8f5d2dfd5a8a 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -161,7 +161,7 @@ static void nfs_direct_req_release(struct kref *kref)
161 * done. This prevents races with I/O completion so we will always wait 161 * done. This prevents races with I/O completion so we will always wait
162 * until all requests have been dispatched and completed. 162 * until all requests have been dispatched and completed.
163 */ 163 */
164static struct nfs_direct_req *nfs_direct_read_alloc(size_t nbytes, unsigned int rsize) 164static struct nfs_direct_req *nfs_direct_read_alloc(size_t nbytes, size_t rsize)
165{ 165{
166 struct list_head *list; 166 struct list_head *list;
167 struct nfs_direct_req *dreq; 167 struct nfs_direct_req *dreq;
@@ -244,14 +244,14 @@ static void nfs_direct_read_schedule(struct nfs_direct_req *dreq, struct inode *
244{ 244{
245 struct list_head *list = &dreq->list; 245 struct list_head *list = &dreq->list;
246 struct page **pages = dreq->pages; 246 struct page **pages = dreq->pages;
247 size_t rsize = NFS_SERVER(inode)->rsize;
247 unsigned int curpage, pgbase; 248 unsigned int curpage, pgbase;
248 unsigned int rsize = NFS_SERVER(inode)->rsize;
249 249
250 curpage = 0; 250 curpage = 0;
251 pgbase = user_addr & ~PAGE_MASK; 251 pgbase = user_addr & ~PAGE_MASK;
252 do { 252 do {
253 struct nfs_read_data *data; 253 struct nfs_read_data *data;
254 unsigned int bytes; 254 size_t bytes;
255 255
256 bytes = rsize; 256 bytes = rsize;
257 if (count < rsize) 257 if (count < rsize)