ceph: include snapc in debug message of write

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 825931516623cd254f95495e97e03ca7e8b20def..0b073b6a2616893f5606ea8e8e908fcd19b34ffa 100644 (file)
--- 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)
        if (snap_size < page_off + len)
                len = snap_size - page_off;
 
-       dout("writepage %p page %p index %lu on %llu~%u snapc %p\n",
-            inode, page, page->index, page_off, len, snapc);
+       dout("writepage %p page %p index %lu on %llu~%u snapc %p seq %lld\n",
+            inode, page, page->index, page_off, len, snapc, snapc->seq);
 
        writeback_stat = atomic_long_inc_return(&fsc->writeback_count);
        if (writeback_stat >

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 1ce80f66e9e596b9d2a912c55576c6ae3adab211..f602b3ee6c59baf4dbac7b38ba1f187fbacec5a5 100644 (file)
--- 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,
        ssize_t ret;
        size_t len = iov_iter_count(to);
 
-       dout("sync_read on file %p %llu~%u %s\n", file, off,
-            (unsigned)len,
+       dout("sync_read on file %p %llu~%u %s\n", file, off, (unsigned)len,
             (file->f_flags & O_DIRECT) ? "O_DIRECT" : "");
 
        if (!len)
@@ -846,8 +845,9 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
        if (write && ceph_snap(file_inode(file)) != CEPH_NOSNAP)
                return -EROFS;
 
-       dout("sync_direct_read_write (%s) on file %p %lld~%u\n",
-            (write ? "write" : "read"), file, pos, (unsigned)count);
+       dout("sync_direct_%s on file %p %lld~%u snapc %p seq %lld\n",
+            (write ? "write" : "read"), file, pos, (unsigned)count,
+            snapc, snapc->seq);
 
        ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count);
        if (ret < 0)
@@ -1050,7 +1050,8 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
        if (ceph_snap(file_inode(file)) != CEPH_NOSNAP)
                return -EROFS;
 
-       dout("sync_write on file %p %lld~%u\n", file, pos, (unsigned)count);
+       dout("sync_write on file %p %lld~%u snapc %p seq %lld\n",
+            file, pos, (unsigned)count, snapc, snapc->seq);
 
        ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count);
        if (ret < 0)