From fa0338a5664dbdb78ef287db1d5a64482ae18c33 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Fri, 23 Mar 2012 14:40:56 -0400 Subject: [PATCH] --- yaml --- r: 297976 b: refs/heads/master c: a7103b99e4cc00b9d40f6bad77389f9e2341820a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/file.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 61133daf4d1f..7666583bae51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35ebb4155f2f9d5580679d368aea81a5933db481 +refs/heads/master: a7103b99e4cc00b9d40f6bad77389f9e2341820a diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index 70bd5464ffdf..5633202b199c 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -2071,9 +2071,7 @@ size_t get_numpages(const size_t wsize, const size_t len, size_t *cur_len) size_t clen; clen = min_t(const size_t, len, wsize); - num_pages = clen / PAGE_CACHE_SIZE; - if (clen % PAGE_CACHE_SIZE) - num_pages++; + num_pages = DIV_ROUND_UP(clen, PAGE_SIZE); if (cur_len) *cur_len = clen;