diff --git a/[refs] b/[refs] index b2f8c085861c..4248570ba978 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93cea5bebf91319095db866163a7e35c3e77d8f2 +refs/heads/master: 6a4ef48103a78a46b80e07fcd8ac4edda0c7128f diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c index fc8aff4767d3..2d88c805a56c 100644 --- a/trunk/fs/ceph/file.c +++ b/trunk/fs/ceph/file.c @@ -350,10 +350,10 @@ static int copy_user_to_page_vector(struct page **pages, return -EFAULT; data += l - bad; left -= l - bad; - if (po) { - po += l - bad; - if (po == PAGE_CACHE_SIZE) - po = 0; + po += l - bad; + if (po == PAGE_CACHE_SIZE) { + po = 0; + i++; } } return len;