diff options
author | Yan, Zheng <zyan@redhat.com> | 2017-08-16 05:24:58 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2017-09-06 13:56:48 -0400 |
commit | 1c0a9c2d978360493054315196c51d8328fa7fae (patch) | |
tree | 88e4dd78125a5abf93c9cd19e545c5bc40ce8f26 | |
parent | 24d063acc26fa7ccebc7aa05498fa3818e660df6 (diff) |
ceph: include snapc in debug message of write
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r-- | fs/ceph/addr.c | 4 | ||||
-rw-r--r-- | fs/ceph/file.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 825931516623..0b073b6a2616 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -569,8 +569,8 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) | |||
569 | if (snap_size < page_off + len) | 569 | if (snap_size < page_off + len) |
570 | len = snap_size - page_off; | 570 | len = snap_size - page_off; |
571 | 571 | ||
572 | dout("writepage %p page %p index %lu on %llu~%u snapc %p\n", | 572 | dout("writepage %p page %p index %lu on %llu~%u snapc %p seq %lld\n", |
573 | inode, page, page->index, page_off, len, snapc); | 573 | inode, page, page->index, page_off, len, snapc, snapc->seq); |
574 | 574 | ||
575 | writeback_stat = atomic_long_inc_return(&fsc->writeback_count); | 575 | writeback_stat = atomic_long_inc_return(&fsc->writeback_count); |
576 | if (writeback_stat > | 576 | if (writeback_stat > |
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 1ce80f66e9e5..f602b3ee6c59 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -562,8 +562,7 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to, | |||
562 | ssize_t ret; | 562 | ssize_t ret; |
563 | size_t len = iov_iter_count(to); | 563 | size_t len = iov_iter_count(to); |
564 | 564 | ||
565 | dout("sync_read on file %p %llu~%u %s\n", file, off, | 565 | dout("sync_read on file %p %llu~%u %s\n", file, off, (unsigned)len, |
566 | (unsigned)len, | ||
567 | (file->f_flags & O_DIRECT) ? "O_DIRECT" : ""); | 566 | (file->f_flags & O_DIRECT) ? "O_DIRECT" : ""); |
568 | 567 | ||
569 | if (!len) | 568 | if (!len) |
@@ -846,8 +845,9 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, | |||
846 | if (write && ceph_snap(file_inode(file)) != CEPH_NOSNAP) | 845 | if (write && ceph_snap(file_inode(file)) != CEPH_NOSNAP) |
847 | return -EROFS; | 846 | return -EROFS; |
848 | 847 | ||
849 | dout("sync_direct_read_write (%s) on file %p %lld~%u\n", | 848 | dout("sync_direct_%s on file %p %lld~%u snapc %p seq %lld\n", |
850 | (write ? "write" : "read"), file, pos, (unsigned)count); | 849 | (write ? "write" : "read"), file, pos, (unsigned)count, |
850 | snapc, snapc->seq); | ||
851 | 851 | ||
852 | ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count); | 852 | ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count); |
853 | if (ret < 0) | 853 | if (ret < 0) |
@@ -1050,7 +1050,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, | |||
1050 | if (ceph_snap(file_inode(file)) != CEPH_NOSNAP) | 1050 | if (ceph_snap(file_inode(file)) != CEPH_NOSNAP) |
1051 | return -EROFS; | 1051 | return -EROFS; |
1052 | 1052 | ||
1053 | dout("sync_write on file %p %lld~%u\n", file, pos, (unsigned)count); | 1053 | dout("sync_write on file %p %lld~%u snapc %p seq %lld\n", |
1054 | file, pos, (unsigned)count, snapc, snapc->seq); | ||
1054 | 1055 | ||
1055 | ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count); | 1056 | ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count); |
1056 | if (ret < 0) | 1057 | if (ret < 0) |