From: Alex Elder Date: Sat, 2 Mar 2013 00:00:15 +0000 (-0600) Subject: ceph: use calc_pages_for() in start_read() X-Git-Tag: firefly_0821_release~3680^2~249^2~272 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf7b7e1492e97dd0c44479239742eb4cb752eeed;p=firefly-linux-kernel-4.4.55.git ceph: use calc_pages_for() in start_read() There's a spot that computes the number of pages to allocate for a page-aligned length by just shifting it. Use calc_pages_for() instead, to be consistent with usage everywhere else. The result is the same. The reason for this is to make it clearer in an upcoming patch that this calculation is duplicated. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 2a571fb4803b..e53f24b15b12 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -314,7 +314,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) return PTR_ERR(req); /* build page vector */ - nr_pages = len >> PAGE_CACHE_SHIFT; + nr_pages = calc_pages_for(0, len); pages = kmalloc(sizeof(*pages) * nr_pages, GFP_NOFS); ret = -ENOMEM; if (!pages)