ceph: fix comment, remove extraneous args

The offset/length arguments aren't used.

Signed-off-by: Sage Weil <sage@newdream.net>

Sage Weil e98b6fed d8672d64

+11 -15
+9 -11
fs/ceph/file.c
··· 376 376 dout("sync_read on file %p %llu~%u %s\n", file, off, len, 377 377 (file->f_flags & O_DIRECT) ? "O_DIRECT" : ""); 378 378 379 - if (file->f_flags & O_DIRECT) { 380 - pages = ceph_get_direct_page_vector(data, num_pages, off, len); 381 - 382 - /* 383 - * flush any page cache pages in this range. this 384 - * will make concurrent normal and O_DIRECT io slow, 385 - * but it will at least behave sensibly when they are 386 - * in sequence. 387 - */ 388 - } else { 379 + if (file->f_flags & O_DIRECT) 380 + pages = ceph_get_direct_page_vector(data, num_pages); 381 + else 389 382 pages = ceph_alloc_page_vector(num_pages, GFP_NOFS); 390 - } 391 383 if (IS_ERR(pages)) 392 384 return PTR_ERR(pages); 393 385 386 + /* 387 + * flush any page cache pages in this range. this 388 + * will make concurrent normal and sync io slow, 389 + * but it will at least behave sensibly when they are 390 + * in sequence. 391 + */ 394 392 ret = filemap_write_and_wait(inode->i_mapping); 395 393 if (ret < 0) 396 394 goto done;
+1 -2
include/linux/ceph/libceph.h
··· 227 227 extern void ceph_release_page_vector(struct page **pages, int num_pages); 228 228 229 229 extern struct page **ceph_get_direct_page_vector(const char __user *data, 230 - int num_pages, 231 - loff_t off, size_t len); 230 + int num_pages); 232 231 extern void ceph_put_page_vector(struct page **pages, int num_pages); 233 232 extern void ceph_release_page_vector(struct page **pages, int num_pages); 234 233 extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
+1 -2
net/ceph/pagevec.c
··· 13 13 * build a vector of user pages 14 14 */ 15 15 struct page **ceph_get_direct_page_vector(const char __user *data, 16 - int num_pages, 17 - loff_t off, size_t len) 16 + int num_pages) 18 17 { 19 18 struct page **pages; 20 19 int rc;