diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 17:03:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 17:05:21 +0300 |
| commit | 22a867d81707b0a2720bb5f65255265b95d30526 (patch) | |
| tree | 7ec19b155b50b13ae95244c2bfa16aea4920c4f6 /net/ceph/pagevec.c | |
| parent | 5bb6b1ea67a73f0665a41726dd7138977b992c6c (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
| download | linux-22a867d81707b0a2720bb5f65255265b95d30526.tar.xz | |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ceph/pagevec.c')
| -rw-r--r-- | net/ceph/pagevec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c index 54caf0687155..ac34feeb2b3a 100644 --- a/net/ceph/pagevec.c +++ b/net/ceph/pagevec.c @@ -13,8 +13,7 @@ * build a vector of user pages */ struct page **ceph_get_direct_page_vector(const char __user *data, - int num_pages, - loff_t off, size_t len) + int num_pages) { struct page **pages; int rc; |