Skip to content

Commit ad5255c

Browse files
lxbszidryomov
lxbsz
authored and
idryomov
committed
ceph: misc fix for code style and logs
To make the logs more readable such as for log likes: ceph: will move 00000000a42b796b to split realm 100000003ed 000000007146df45 With this it will always show the inode numbers instead the inode addresses. Signed-off-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 1ab36c9 commit ad5255c

1 file changed

Lines changed: 62 additions & 60 deletions

File tree

‎fs/ceph/snap.c‎

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static struct ceph_snap_realm *ceph_create_snap_realm(
137137
__insert_snap_realm(&mdsc->snap_realms, realm);
138138
mdsc->num_snap_realms++;
139139

140-
dout("create_snap_realm %llx %p\n", realm->ino, realm);
140+
dout("%s %llx %p\n", __func__, realm->ino, realm);
141141
return realm;
142142
}
143143

@@ -161,7 +161,7 @@ static struct ceph_snap_realm *__lookup_snap_realm(struct ceph_mds_client *mdsc,
161161
else if (ino > r->ino)
162162
n = n->rb_right;
163163
else {
164-
dout("lookup_snap_realm %llx %p\n", r->ino, r);
164+
dout("%s %llx %p\n", __func__, r->ino, r);
165165
return r;
166166
}
167167
}
@@ -189,7 +189,7 @@ static void __destroy_snap_realm(struct ceph_mds_client *mdsc,
189189
{
190190
lockdep_assert_held_write(&mdsc->snap_rwsem);
191191

192-
dout("__destroy_snap_realm %p %llx\n", realm, realm->ino);
192+
dout("%s %p %llx\n", __func__, realm, realm->ino);
193193

194194
rb_erase(&realm->node, &mdsc->snap_realms);
195195
mdsc->num_snap_realms--;
@@ -302,9 +302,8 @@ static int adjust_snap_realm_parent(struct ceph_mds_client *mdsc,
302302
if (IS_ERR(parent))
303303
return PTR_ERR(parent);
304304
}
305-
dout("adjust_snap_realm_parent %llx %p: %llx %p -> %llx %p\n",
306-
realm->ino, realm, realm->parent_ino, realm->parent,
307-
parentino, parent);
305+
dout("%s %llx %p: %llx %p -> %llx %p\n", __func__, realm->ino,
306+
realm, realm->parent_ino, realm->parent, parentino, parent);
308307
if (realm->parent) {
309308
list_del_init(&realm->child_item);
310309
ceph_put_snap_realm(mdsc, realm->parent);
@@ -360,9 +359,8 @@ static int build_snap_context(struct ceph_snap_realm *realm,
360359
realm->cached_context->seq == realm->seq &&
361360
(!parent ||
362361
realm->cached_context->seq >= parent->cached_context->seq)) {
363-
dout("build_snap_context %llx %p: %p seq %lld (%u snaps)"
364-
" (unchanged)\n",
365-
realm->ino, realm, realm->cached_context,
362+
dout("%s %llx %p: %p seq %lld (%u snaps) (unchanged)\n",
363+
__func__, realm->ino, realm, realm->cached_context,
366364
realm->cached_context->seq,
367365
(unsigned int)realm->cached_context->num_snaps);
368366
return 0;
@@ -401,9 +399,8 @@ static int build_snap_context(struct ceph_snap_realm *realm,
401399

402400
sort(snapc->snaps, num, sizeof(u64), cmpu64_rev, NULL);
403401
snapc->num_snaps = num;
404-
dout("build_snap_context %llx %p: %p seq %lld (%u snaps)\n",
405-
realm->ino, realm, snapc, snapc->seq,
406-
(unsigned int) snapc->num_snaps);
402+
dout("%s %llx %p: %p seq %lld (%u snaps)\n", __func__, realm->ino,
403+
realm, snapc, snapc->seq, (unsigned int) snapc->num_snaps);
407404

408405
ceph_put_snap_context(realm->cached_context);
409406
realm->cached_context = snapc;
@@ -420,8 +417,7 @@ static int build_snap_context(struct ceph_snap_realm *realm,
420417
ceph_put_snap_context(realm->cached_context);
421418
realm->cached_context = NULL;
422419
}
423-
pr_err("build_snap_context %llx %p fail %d\n", realm->ino,
424-
realm, err);
420+
pr_err("%s %llx %p fail %d\n", __func__, realm->ino, realm, err);
425421
return err;
426422
}
427423

@@ -455,7 +451,7 @@ static void rebuild_snap_realms(struct ceph_snap_realm *realm,
455451
}
456452

457453
last = build_snap_context(_realm, &realm_queue, dirty_realms);
458-
dout("rebuild_snap_realms %llx %p, %s\n", _realm->ino, _realm,
454+
dout("%s %llx %p, %s\n", __func__, _realm->ino, _realm,
459455
last > 0 ? "is deferred" : !last ? "succeeded" : "failed");
460456

461457
/* is any child in the list ? */
@@ -551,12 +547,14 @@ static void ceph_queue_cap_snap(struct ceph_inode_info *ci,
551547
as no new writes are allowed to start when pending, so any
552548
writes in progress now were started before the previous
553549
cap_snap. lucky us. */
554-
dout("queue_cap_snap %p already pending\n", inode);
550+
dout("%s %p %llx.%llx already pending\n",
551+
__func__, inode, ceph_vinop(inode));
555552
goto update_snapc;
556553
}
557554
if (ci->i_wrbuffer_ref_head == 0 &&
558555
!(dirty & (CEPH_CAP_ANY_EXCL|CEPH_CAP_FILE_WR))) {
559-
dout("queue_cap_snap %p nothing dirty|writing\n", inode);
556+
dout("%s %p %llx.%llx nothing dirty|writing\n",
557+
__func__, inode, ceph_vinop(inode));
560558
goto update_snapc;
561559
}
562560

@@ -576,15 +574,15 @@ static void ceph_queue_cap_snap(struct ceph_inode_info *ci,
576574
} else {
577575
if (!(used & CEPH_CAP_FILE_WR) &&
578576
ci->i_wrbuffer_ref_head == 0) {
579-
dout("queue_cap_snap %p "
580-
"no new_snap|dirty_page|writing\n", inode);
577+
dout("%s %p %llx.%llx no new_snap|dirty_page|writing\n",
578+
__func__, inode, ceph_vinop(inode));
581579
goto update_snapc;
582580
}
583581
}
584582

585-
dout("queue_cap_snap %p cap_snap %p queuing under %p %s %s\n",
586-
inode, capsnap, old_snapc, ceph_cap_string(dirty),
587-
capsnap->need_flush ? "" : "no_flush");
583+
dout("%s %p %llx.%llx cap_snap %p queuing under %p %s %s\n",
584+
__func__, inode, ceph_vinop(inode), capsnap, old_snapc,
585+
ceph_cap_string(dirty), capsnap->need_flush ? "" : "no_flush");
588586
ihold(inode);
589587

590588
capsnap->follows = old_snapc->seq;
@@ -616,8 +614,8 @@ static void ceph_queue_cap_snap(struct ceph_inode_info *ci,
616614
list_add_tail(&capsnap->ci_item, &ci->i_cap_snaps);
617615

618616
if (used & CEPH_CAP_FILE_WR) {
619-
dout("queue_cap_snap %p cap_snap %p snapc %p"
620-
" seq %llu used WR, now pending\n", inode,
617+
dout("%s %p %llx.%llx cap_snap %p snapc %p seq %llu used WR,"
618+
" now pending\n", __func__, inode, ceph_vinop(inode),
621619
capsnap, old_snapc, old_snapc->seq);
622620
capsnap->writing = 1;
623621
} else {
@@ -628,12 +626,12 @@ static void ceph_queue_cap_snap(struct ceph_inode_info *ci,
628626
old_snapc = NULL;
629627

630628
update_snapc:
631-
if (ci->i_wrbuffer_ref_head == 0 &&
632-
ci->i_wr_ref == 0 &&
633-
ci->i_dirty_caps == 0 &&
634-
ci->i_flushing_caps == 0) {
635-
ci->i_head_snapc = NULL;
636-
} else {
629+
if (ci->i_wrbuffer_ref_head == 0 &&
630+
ci->i_wr_ref == 0 &&
631+
ci->i_dirty_caps == 0 &&
632+
ci->i_flushing_caps == 0) {
633+
ci->i_head_snapc = NULL;
634+
} else {
637635
ci->i_head_snapc = ceph_get_snap_context(new_snapc);
638636
dout(" new snapc is %p\n", new_snapc);
639637
}
@@ -668,27 +666,28 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci,
668666
capsnap->truncate_size = ci->i_truncate_size;
669667
capsnap->truncate_seq = ci->i_truncate_seq;
670668
if (capsnap->dirty_pages) {
671-
dout("finish_cap_snap %p cap_snap %p snapc %p %llu %s s=%llu "
672-
"still has %d dirty pages\n", inode, capsnap,
673-
capsnap->context, capsnap->context->seq,
674-
ceph_cap_string(capsnap->dirty), capsnap->size,
675-
capsnap->dirty_pages);
669+
dout("%s %p %llx.%llx cap_snap %p snapc %p %llu %s s=%llu "
670+
"still has %d dirty pages\n", __func__, inode,
671+
ceph_vinop(inode), capsnap, capsnap->context,
672+
capsnap->context->seq, ceph_cap_string(capsnap->dirty),
673+
capsnap->size, capsnap->dirty_pages);
676674
return 0;
677675
}
678676

679677
/* Fb cap still in use, delay it */
680678
if (ci->i_wb_ref) {
681-
dout("finish_cap_snap %p cap_snap %p snapc %p %llu %s s=%llu "
682-
"used WRBUFFER, delaying\n", inode, capsnap,
683-
capsnap->context, capsnap->context->seq,
684-
ceph_cap_string(capsnap->dirty), capsnap->size);
679+
dout("%s %p %llx.%llx cap_snap %p snapc %p %llu %s s=%llu "
680+
"used WRBUFFER, delaying\n", __func__, inode,
681+
ceph_vinop(inode), capsnap, capsnap->context,
682+
capsnap->context->seq, ceph_cap_string(capsnap->dirty),
683+
capsnap->size);
685684
capsnap->writing = 1;
686685
return 0;
687686
}
688687

689688
ci->i_ceph_flags |= CEPH_I_FLUSH_SNAPS;
690-
dout("finish_cap_snap %p cap_snap %p snapc %p %llu %s s=%llu\n",
691-
inode, capsnap, capsnap->context,
689+
dout("%s %p %llx.%llx cap_snap %p snapc %p %llu %s s=%llu\n",
690+
__func__, inode, ceph_vinop(inode), capsnap, capsnap->context,
692691
capsnap->context->seq, ceph_cap_string(capsnap->dirty),
693692
capsnap->size);
694693

@@ -709,7 +708,7 @@ static void queue_realm_cap_snaps(struct ceph_snap_realm *realm)
709708
struct inode *lastinode = NULL;
710709
struct ceph_cap_snap *capsnap = NULL;
711710

712-
dout("queue_realm_cap_snaps %p %llx inodes\n", realm, realm->ino);
711+
dout("%s %p %llx inode\n", __func__, realm, realm->ino);
713712

714713
spin_lock(&realm->inodes_with_caps_lock);
715714
list_for_each_entry(ci, &realm->inodes_with_caps, i_snap_realm_item) {
@@ -747,7 +746,7 @@ static void queue_realm_cap_snaps(struct ceph_snap_realm *realm)
747746

748747
if (capsnap)
749748
kmem_cache_free(ceph_cap_snap_cachep, capsnap);
750-
dout("queue_realm_cap_snaps %p %llx done\n", realm, realm->ino);
749+
dout("%s %p %llx done\n", __func__, realm, realm->ino);
751750
}
752751

753752
/*
@@ -773,7 +772,7 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
773772

774773
lockdep_assert_held_write(&mdsc->snap_rwsem);
775774

776-
dout("update_snap_trace deletion=%d\n", deletion);
775+
dout("%s deletion=%d\n", __func__, deletion);
777776
more:
778777
rebuild_snapcs = 0;
779778
ceph_decode_need(&p, e, sizeof(*ri), bad);
@@ -802,7 +801,7 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
802801
rebuild_snapcs += err;
803802

804803
if (le64_to_cpu(ri->seq) > realm->seq) {
805-
dout("update_snap_trace updating %llx %p %lld -> %lld\n",
804+
dout("%s updating %llx %p %lld -> %lld\n", __func__,
806805
realm->ino, realm, realm->seq, le64_to_cpu(ri->seq));
807806
/* update realm parameters, snap lists */
808807
realm->seq = le64_to_cpu(ri->seq);
@@ -826,11 +825,11 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
826825

827826
rebuild_snapcs = 1;
828827
} else if (!realm->cached_context) {
829-
dout("update_snap_trace %llx %p seq %lld new\n",
828+
dout("%s %llx %p seq %lld new\n", __func__,
830829
realm->ino, realm, realm->seq);
831830
rebuild_snapcs = 1;
832831
} else {
833-
dout("update_snap_trace %llx %p seq %lld unchanged\n",
832+
dout("%s %llx %p seq %lld unchanged\n", __func__,
834833
realm->ino, realm, realm->seq);
835834
}
836835

@@ -883,7 +882,7 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc,
883882
ceph_put_snap_realm(mdsc, realm);
884883
if (first_realm)
885884
ceph_put_snap_realm(mdsc, first_realm);
886-
pr_err("update_snap_trace error %d\n", err);
885+
pr_err("%s error %d\n", __func__, err);
887886
return err;
888887
}
889888

@@ -900,7 +899,7 @@ static void flush_snaps(struct ceph_mds_client *mdsc)
900899
struct inode *inode;
901900
struct ceph_mds_session *session = NULL;
902901

903-
dout("flush_snaps\n");
902+
dout("%s\n", __func__);
904903
spin_lock(&mdsc->snap_flush_lock);
905904
while (!list_empty(&mdsc->snap_flush_list)) {
906905
ci = list_first_entry(&mdsc->snap_flush_list,
@@ -915,7 +914,7 @@ static void flush_snaps(struct ceph_mds_client *mdsc)
915914
spin_unlock(&mdsc->snap_flush_lock);
916915

917916
ceph_put_mds_session(session);
918-
dout("flush_snaps done\n");
917+
dout("%s done\n", __func__);
919918
}
920919

921920
/**
@@ -997,8 +996,8 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
997996
trace_len = le32_to_cpu(h->trace_len);
998997
p += sizeof(*h);
999998

1000-
dout("handle_snap from mds%d op %s split %llx tracelen %d\n", mds,
1001-
ceph_snap_op_name(op), split, trace_len);
999+
dout("%s from mds%d op %s split %llx tracelen %d\n", __func__,
1000+
mds, ceph_snap_op_name(op), split, trace_len);
10021001

10031002
mutex_lock(&session->s_mutex);
10041003
inc_session_sequence(session);
@@ -1058,13 +1057,13 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
10581057
*/
10591058
if (ci->i_snap_realm->created >
10601059
le64_to_cpu(ri->created)) {
1061-
dout(" leaving %p in newer realm %llx %p\n",
1062-
inode, ci->i_snap_realm->ino,
1060+
dout(" leaving %p %llx.%llx in newer realm %llx %p\n",
1061+
inode, ceph_vinop(inode), ci->i_snap_realm->ino,
10631062
ci->i_snap_realm);
10641063
goto skip_inode;
10651064
}
1066-
dout(" will move %p to split realm %llx %p\n",
1067-
inode, realm->ino, realm);
1065+
dout(" will move %p %llx.%llx to split realm %llx %p\n",
1066+
inode, ceph_vinop(inode), realm->ino, realm);
10681067

10691068
ceph_get_snap_realm(mdsc, realm);
10701069
ceph_change_snap_realm(inode, realm);
@@ -1107,7 +1106,7 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
11071106
return;
11081107

11091108
bad:
1110-
pr_err("corrupt snap message from mds%d\n", mds);
1109+
pr_err("%s corrupt snap message from mds%d\n", __func__, mds);
11111110
ceph_msg_dump(msg);
11121111
out:
11131112
if (locked_rwsem)
@@ -1140,7 +1139,8 @@ struct ceph_snapid_map* ceph_get_snapid_map(struct ceph_mds_client *mdsc,
11401139
}
11411140
spin_unlock(&mdsc->snapid_map_lock);
11421141
if (exist) {
1143-
dout("found snapid map %llx -> %x\n", exist->snap, exist->dev);
1142+
dout("%s found snapid map %llx -> %x\n", __func__,
1143+
exist->snap, exist->dev);
11441144
return exist;
11451145
}
11461146

@@ -1184,11 +1184,13 @@ struct ceph_snapid_map* ceph_get_snapid_map(struct ceph_mds_client *mdsc,
11841184
if (exist) {
11851185
free_anon_bdev(sm->dev);
11861186
kfree(sm);
1187-
dout("found snapid map %llx -> %x\n", exist->snap, exist->dev);
1187+
dout("%s found snapid map %llx -> %x\n", __func__,
1188+
exist->snap, exist->dev);
11881189
return exist;
11891190
}
11901191

1191-
dout("create snapid map %llx -> %x\n", sm->snap, sm->dev);
1192+
dout("%s create snapid map %llx -> %x\n", __func__,
1193+
sm->snap, sm->dev);
11921194
return sm;
11931195
}
11941196

0 commit comments

Comments
 (0)