diff options
Diffstat (limited to 'fs/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 3d6dcf23b4ad..47826c2ef511 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -540,9 +540,6 @@ more: | |||
540 | if (IS_ERR(req)) | 540 | if (IS_ERR(req)) |
541 | return PTR_ERR(req); | 541 | return PTR_ERR(req); |
542 | 542 | ||
543 | ceph_osdc_build_request(req, pos, num_ops, ops, | ||
544 | snapc, vino.snap, &mtime); | ||
545 | |||
546 | /* write from beginning of first page, regardless of io alignment */ | 543 | /* write from beginning of first page, regardless of io alignment */ |
547 | page_align = file->f_flags & O_DIRECT ? buf_align : io_align; | 544 | page_align = file->f_flags & O_DIRECT ? buf_align : io_align; |
548 | num_pages = calc_pages_for(page_align, len); | 545 | num_pages = calc_pages_for(page_align, len); |
@@ -583,6 +580,10 @@ more: | |||
583 | req->r_data_out.alignment = page_align; | 580 | req->r_data_out.alignment = page_align; |
584 | req->r_inode = inode; | 581 | req->r_inode = inode; |
585 | 582 | ||
583 | /* BUG_ON(vino.snap != CEPH_NOSNAP); */ | ||
584 | ceph_osdc_build_request(req, pos, num_ops, ops, | ||
585 | snapc, vino.snap, &mtime); | ||
586 | |||
586 | ret = ceph_osdc_start_request(&fsc->client->osdc, req, false); | 587 | ret = ceph_osdc_start_request(&fsc->client->osdc, req, false); |
587 | if (!ret) { | 588 | if (!ret) { |
588 | if (req->r_safe_callback) { | 589 | if (req->r_safe_callback) { |