From 61ddcbff6cc1ca207deb7742976ed8a083239ff1 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Fri, 16 Mar 2012 08:29:06 -0700 Subject: [PATCH] pohmelfs: Use current logging styles. Add and use pr_fmt, remove embedded prefixes Logging messages can have prefixes added by pr_fmt. Remove embedded prefixes. Remove embedded function names, use %s, __func__ where necessary. pr_debug output is currently only enabled with dynamic_debug and can have function names emitted by dynamic_debug using +f so remove the embedded function names from pr_debug uses. Coalesce formats and align arguments. Signed-off-by: Joe Perches --- fs/pohmelfs/dir.c | 84 ++++++++++++++++++++++++++++++----------------------- fs/pohmelfs/file.c | 47 ++++++++++++++++++------------ fs/pohmelfs/inode.c | 80 +++++++++++++++++++++++++++++--------------------- fs/pohmelfs/net.c | 27 ++++++++++------- fs/pohmelfs/route.c | 7 +++-- fs/pohmelfs/stat.c | 10 ++++--- fs/pohmelfs/super.c | 14 +++++---- fs/pohmelfs/trans.c | 11 ++++--- 8 files changed, 166 insertions(+), 114 deletions(-) diff --git a/fs/pohmelfs/dir.c b/fs/pohmelfs/dir.c index fd11ff3ed5f..67b61ac53bb 100644 --- a/fs/pohmelfs/dir.c +++ b/fs/pohmelfs/dir.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -38,8 +40,9 @@ static int pohmelfs_send_dentry_complete(struct pohmelfs_trans *t, struct pohmel if (cmd->status == 0 && cmd->size != sizeof(struct dnet_attr) + 2) cmd->status = -EINVAL; - pr_debug("pohmelfs: %s: pohmelfs_send_dentry_complete: %llu, cmd_size: %llu, flags: %x, status: %d\n", - pohmelfs_dump_id(pi->id.id), trans, cmd->size, cmd->flags, cmd->status); + pr_debug("%s: %llu, cmd_size: %llu, flags: %x, status: %d\n", + pohmelfs_dump_id(pi->id.id), trans, cmd->size, + cmd->flags, cmd->status); if (!cmd->status) wait->condition = 1; @@ -90,9 +93,10 @@ static int pohmelfs_lookup_complete(struct pohmelfs_trans *t, struct pohmelfs_st goto err_out_exit; } - pr_debug("pohmelfs: %s: pohmelfs_lookup_complete: %llu, size: %llu, min size: %zu, flags: %x, status: %d\n", - pohmelfs_dump_id(parent->id.id), trans, cmd->size, - sizeof(struct dnet_attr) + sizeof(struct pohmelfs_inode_info), cmd->flags, cmd->status); + pr_debug("%s: %llu, size: %llu, min size: %zu, flags: %x, status: %d\n", + pohmelfs_dump_id(parent->id.id), trans, cmd->size, + sizeof(struct dnet_attr) + sizeof(struct pohmelfs_inode_info), + cmd->flags, cmd->status); info = t->recv_data + sizeof(struct dnet_attr); @@ -197,12 +201,13 @@ int pohmelfs_send_script_request(struct pohmelfs_inode *parent, struct pohmelfs_ int len = 6; char parent_id_str[len*2+1]; - pr_debug("pohmelfs: SENT: %.*s: %s: inode->id: %s, ino: %lu, object: %s, binary size: %d, ret: %p, condition: %d\n", - req->script_namelen, req->script_name, - pohmelfs_dump_id(req->id->id), - pohmelfs_dump_id_len_raw(parent->id.id, len, parent_id_str), - parent->vfs_inode.i_ino, req->obj_name, req->binary_size, - req->ret, req->ret_cond); + pr_debug("SENT: %.*s: %s: inode->id: %s, ino: %lu, object: %s, binary size: %d, ret: %p, condition: %d\n", + req->script_namelen, req->script_name, + pohmelfs_dump_id(req->id->id), + pohmelfs_dump_id_len_raw(parent->id.id, len, + parent_id_str), + parent->vfs_inode.i_ino, req->obj_name, + req->binary_size, req->ret, req->ret_cond); } if (req->sync) { @@ -232,12 +237,13 @@ err_out_exit: int len = 6; char parent_id_str[len*2+1]; - pr_debug("pohmelfs: DONE: %.*s: %s: inode->id: %s, ino: %lu, object: %s, binary size: %d, ret: %p, condition: %d, err: %d\n", - req->script_namelen, req->script_name, - pohmelfs_dump_id(req->id->id), - pohmelfs_dump_id_len_raw(parent->id.id, len, parent_id_str), - parent->vfs_inode.i_ino, req->obj_name, req->binary_size, - req->ret, req->ret_cond, err); + pr_debug("DONE: %.*s: %s: inode->id: %s, ino: %lu, object: %s, binary size: %d, ret: %p, condition: %d, err: %d\n", + req->script_namelen, req->script_name, + pohmelfs_dump_id(req->id->id), + pohmelfs_dump_id_len_raw(parent->id.id, len, + parent_id_str), + parent->vfs_inode.i_ino, req->obj_name, + req->binary_size, req->ret, req->ret_cond, err); } return err; } @@ -324,9 +330,9 @@ static int pohmelfs_create(struct inode *dir, struct dentry *dentry, umode_t mod if (err) goto err_out_exit; - pr_debug("pohmelfs: create: %s, ino: %lu, parent dir: %lu, object: %s\n", - pohmelfs_dump_id(pi->id.id), pi->vfs_inode.i_ino, - dir->i_ino, dentry->d_name.name); + pr_debug("%s: ino: %lu, parent dir: %lu, object: %s\n", + pohmelfs_dump_id(pi->id.id), pi->vfs_inode.i_ino, + dir->i_ino, dentry->d_name.name); return 0; @@ -373,8 +379,9 @@ static struct pohmelfs_inode *pohmelfs_lookup_group(struct inode *dir, struct de return pi; err_out_exit: - pr_debug("pohmelfs: pohmelfs_lookup_group: %s: group: %d: parent ino: %lu, name: %s: %d\n", - pohmelfs_dump_id(parent->id.id), group_id, parent->vfs_inode.i_ino, dentry->d_name.name, err); + pr_debug("%s: group: %d: parent ino: %lu, name: %s: %d\n", + pohmelfs_dump_id(parent->id.id), group_id, + parent->vfs_inode.i_ino, dentry->d_name.name, err); return ERR_PTR(err); } @@ -424,9 +431,9 @@ static int pohmelfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode if (err) goto err_out_dir; - pr_debug("pohmelfs: mkdir: %s, ino: %lu, parent dir: %lu, object: %s, refcnt: %d\n", - pohmelfs_dump_id(pi->id.id), pi->vfs_inode.i_ino, - dir->i_ino, dentry->d_name.name, dentry->d_count); + pr_debug("%s: ino: %lu, parent dir: %lu, object: %s, refcnt: %d\n", + pohmelfs_dump_id(pi->id.id), pi->vfs_inode.i_ino, + dir->i_ino, dentry->d_name.name, dentry->d_count); return 0; err_out_dir: @@ -498,10 +505,11 @@ static int pohmelfs_rename(struct inode *old_dir, struct dentry *old_dentry, int size = sizeof(struct pohmelfs_rename_req) + new_dentry->d_name.len; int err; - pr_debug("pohmelfs: %s: rename: %.*s -> %.*s: mtime: %ld\n", pohmelfs_dump_id(pi->id.id), - old_dentry->d_name.len, old_dentry->d_name.name, - new_dentry->d_name.len, new_dentry->d_name.name, - inode->i_mtime.tv_sec); + pr_debug("%s: rename: %.*s -> %.*s: mtime: %ld\n", + pohmelfs_dump_id(pi->id.id), + old_dentry->d_name.len, old_dentry->d_name.name, + new_dentry->d_name.len, new_dentry->d_name.name, + inode->i_mtime.tv_sec); if (pohmelfs_sb(inode->i_sb)->http_compat) { err = -ENOTSUPP; @@ -716,8 +724,9 @@ static int pohmelfs_readdir_complete(struct pohmelfs_trans *t, struct pohmelfs_s struct pohmelfs_wait *wait = t->priv; struct dnet_cmd *cmd = &recv->cmd; - pr_debug("pohmelfs: %s: readdir comlete: cmd size: %llu, flags: %x\n", - pohmelfs_dump_id(pi->id.id), (unsigned long long)cmd->size, cmd->flags); + pr_debug("%s: cmd size: %llu, flags: %x\n", + pohmelfs_dump_id(pi->id.id), (unsigned long long)cmd->size, + cmd->flags); if (cmd->flags & DNET_FLAGS_MORE) { if (cmd->size > sizeof(struct dnet_attr)) { @@ -858,7 +867,8 @@ static int pohmelfs_fetch_inode_info_complete(struct pohmelfs_trans *t, struct p info->namelen = fi->len; err = pohmelfs_update_inode(fi->parent, info, fi->name); - pr_debug("pohmelfs: %s: fetched: '%.*s': %d\n", pohmelfs_dump_id(cmd->id.id), fi->len, fi->name, err); + pr_debug("%s: fetched: '%.*s': %d\n", + pohmelfs_dump_id(cmd->id.id), fi->len, fi->name, err); return 0; } @@ -950,11 +960,11 @@ static int pohmelfs_readdir_process(void *data, int size, struct file *filp, voi str.hash = full_name_hash(str.name, str.len); child = d_lookup(dentry, &str); - pr_debug("pohmelfs: %s: child: %.*s/%.*s: %p\n", - pohmelfs_dump_id(d->id.id), - dentry->d_name.len, dentry->d_name.name, - d->len, d->name, - child); + pr_debug("%s: child: %.*s/%.*s: %p\n", + pohmelfs_dump_id(d->id.id), + dentry->d_name.len, dentry->d_name.name, + d->len, d->name, + child); if (!child) { pohmelfs_fetch_inode_info(dentry, pohmelfs_inode(dir), d); } else { diff --git a/fs/pohmelfs/file.c b/fs/pohmelfs/file.c index ce83ca42f1d..46b6812dd34 100644 --- a/fs/pohmelfs/file.c +++ b/fs/pohmelfs/file.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include "pohmelfs.h" @@ -31,8 +33,8 @@ static int pohmelfs_write_complete(struct pohmelfs_trans *t, struct pohmelfs_sta struct dnet_cmd *cmd = &recv->cmd; unsigned long long trans = cmd->trans & ~DNET_TRANS_REPLY; - pr_debug("pohmelfs: %s: write complete: %llu, flags: %x, status: %d\n", - pohmelfs_dump_id(pi->id.id), trans, cmd->flags, cmd->status); + pr_debug("%s: %llu, flags: %x, status: %d\n", + pohmelfs_dump_id(pi->id.id), trans, cmd->flags, cmd->status); if (cmd->flags & DNET_FLAGS_MORE) return 0; @@ -131,8 +133,9 @@ static int pohmelfs_write_command_complete(struct pohmelfs_trans *t, struct pohm unsigned long long size = le64_to_cpu(t->cmd.p.io.size); unsigned long long offset = le64_to_cpu(t->cmd.p.io.offset); - pr_debug("pohmelfs: %s: write failed: ino: %lu, isize: %llu, offset: %llu, size: %llu: %d\n", - pohmelfs_dump_id(pi->id.id), inode->i_ino, inode->i_size, offset, size, cmd->status); + pr_debug("%s: write failed: ino: %lu, isize: %llu, offset: %llu, size: %llu: %d\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, + inode->i_size, offset, size, cmd->status); } return 0; @@ -192,8 +195,9 @@ int pohmelfs_write_command(struct pohmelfs_inode *pi, struct pohmelfs_write_ctl pio->cb.init = pohmelfs_write_command_init; pio->cb.destroy = pohmelfs_write_command_destroy; - pr_debug("pohmelfs_write_prepare_commit: %s: ino: %lu, offset: %llu, len: %zu, total size: %llu\n", - pohmelfs_dump_id(pi->id.id), inode->i_ino, (unsigned long long)offset, len, inode->i_size); + pr_debug("%s: ino: %lu, offset: %llu, len: %zu, total size: %llu\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, + (unsigned long long)offset, len, inode->i_size); err = pohmelfs_send_io(pio); if (err) @@ -280,9 +284,10 @@ static long pohmelfs_fallocate(struct file *file, int mode, loff_t offset, loff_ pio->ioflags = DNET_IO_FLAGS_PREPARE; pio->num = i_size_read(inode); - pr_debug("pohmelfs_fallocate: %s: ino: %lu, offset: %llu, len: %llu, total size: %llu\n", - pohmelfs_dump_id(pi->id.id), inode->i_ino, - (unsigned long long)offset, (unsigned long long)len, inode->i_size); + pr_debug("%s: ino: %lu, offset: %llu, len: %llu, total size: %llu\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, + (unsigned long long)offset, (unsigned long long)len, + inode->i_size); err = pohmelfs_send_io(pio); if (err) @@ -311,8 +316,9 @@ static int pohmelfs_read_latest_complete(struct pohmelfs_trans *t, struct pohmel goto err_out_exit; if (cmd->flags & DNET_FLAGS_MORE) { - pr_debug("pohmelfs: %s: read-latest: complete: group: %d, attr size: %lld\n", - pohmelfs_dump_id(cmd->id.id), cmd->id.group_id, cmd->size - sizeof(struct dnet_attr)); + pr_debug("%s: group: %d, attr size: %lld\n", + pohmelfs_dump_id(cmd->id.id), cmd->id.group_id, + cmd->size - sizeof(struct dnet_attr)); if (cmd->size < sizeof(struct dnet_attr) + 4) { err = -ENOENT; goto err_out_exit; @@ -330,8 +336,9 @@ static int pohmelfs_read_latest_complete(struct pohmelfs_trans *t, struct pohmel pi->group_num = (cmd->size - sizeof(struct dnet_attr)) / sizeof(int); memcpy(pi->groups, t->recv_data + sizeof(struct dnet_attr), pi->group_num * sizeof(int)); - pr_debug("pohmelfs: %s: read-latest: complete: group: %d, received: %d groups\n", - pohmelfs_dump_id(cmd->id.id), cmd->id.group_id, pi->group_num); + pr_debug("%s: group: %d, received: %d groups\n", + pohmelfs_dump_id(cmd->id.id), cmd->id.group_id, + pi->group_num); } mutex_unlock(&pi->lock); } @@ -394,7 +401,7 @@ static int pohmelfs_read_latest(struct pohmelfs_inode *pi) kfree(r); - pr_debug("pohmelfs: %s: read-latest: %d groups\n", pohmelfs_dump_id(pi->id.id), pi->group_num); + pr_debug("%s: %d groups\n", pohmelfs_dump_id(pi->id.id), pi->group_num); err_out_exit: return err; @@ -425,10 +432,11 @@ static int pohmelfs_fsync(struct file *filp, loff_t start, loff_t end, int datas err = sync_inode_metadata(inode, 1); mutex_unlock(&inode->i_mutex); } - pr_debug("pohmelfs: fsync: %s: start: %lld, end: %lld, nrpages: %ld, dirty: %d: %d\n", - pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), - (unsigned long long)start, (unsigned long long)end, - inode->i_mapping->nrpages, mapping_cap_writeback_dirty(inode->i_mapping), err); + pr_debug("%s: start: %lld, end: %lld, nrpages: %ld, dirty: %d: %d\n", + pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), + (unsigned long long)start, (unsigned long long)end, + inode->i_mapping->nrpages, + mapping_cap_writeback_dirty(inode->i_mapping), err); return err; } @@ -444,7 +452,8 @@ static int pohmelfs_flush(struct file *filp, fl_owner_t id) if (!err && test_bit(AS_EIO, &inode->i_mapping->flags)) err = -EIO; - pr_debug("pohmelfs: flush: %s: %d\n", pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), err); + pr_debug("%s: %d\n", + pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), err); return err; } diff --git a/fs/pohmelfs/inode.c b/fs/pohmelfs/inode.c index ff6c7cb03b5..5c73d943b91 100644 --- a/fs/pohmelfs/inode.c +++ b/fs/pohmelfs/inode.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -121,8 +123,8 @@ static int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, err = strlen - 1; /* no including 0-byte */ - pr_debug("%s: dname: '%s', len: %u, maxlen: %u, name: '%s', strlen: %d.\n", - __func__, d->d_name.name, d->d_name.len, len, ptr, strlen); + pr_debug("dname: '%s', len: %u, maxlen: %u, name: '%s', strlen: %d\n", + d->d_name.name, d->d_name.len, len, ptr, strlen); err_out_put: dput(d); @@ -233,7 +235,9 @@ void pohmelfs_destroy_inode(struct inode *inode) { struct pohmelfs_inode *pi = pohmelfs_inode(inode); - pr_debug("pohmelfs: %s: destroy: ino: %ld, dirty: %lx\n", pohmelfs_dump_id(pi->id.id), inode->i_ino, inode->i_state & I_DIRTY); + pr_debug("%s: ino: %ld, dirty: %lx\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, + inode->i_state & I_DIRTY); kfree(pi->groups); kmem_cache_free(pohmelfs_inode_cache, pi); @@ -266,9 +270,9 @@ static void pohmelfs_readpages_free(struct kref *kref) struct pohmelfs_inode *pi = rp->wait.pi; int i; - pr_debug("pohmelfs: %s: pohmelfs_readpages_free: read: %ld/%ld, wait: %d\n", - pohmelfs_dump_id(pi->id.id), atomic_long_read(&rp->wait.count), - rp->page_num * PAGE_CACHE_SIZE, rp->wait.condition); + pr_debug("%s: read: %ld/%ld, wait: %d\n", + pohmelfs_dump_id(pi->id.id), atomic_long_read(&rp->wait.count), + rp->page_num * PAGE_CACHE_SIZE, rp->wait.condition); for (i = 0; i < rp->page_num; ++i) { struct page *page = rp->pages[i]; @@ -310,8 +314,9 @@ static int pohmelfs_readpages_complete(struct pohmelfs_trans *t, struct pohmelfs } } - pr_debug("pohmelfs: %d:%s: pohmelfs_readpages_complete: read: %ld, wait: %d\n", - cmd->id.group_id, pohmelfs_dump_id(wait->pi->id.id), atomic_long_read(&wait->count), wait->condition); + pr_debug("%d:%s: read: %ld, wait: %d\n", + cmd->id.group_id, pohmelfs_dump_id(wait->pi->id.id), + atomic_long_read(&wait->count), wait->condition); return 0; } @@ -372,9 +377,10 @@ static int pohmelfs_readpages_recv_reply(struct pohmelfs_trans *t, struct pohmel err_out_exit: if ((err < 0) && (err != -ENOENT) && (err != -EAGAIN)) - pr_err("pohmelfs: %d:%s: pohmelfs_readpages_recv_data: offset: %lld, data size: %llu, err: %d\n", - cmd->id.group_id, pohmelfs_dump_id(pi->id.id), t->io_offset - asize + t->cmd.p.io.offset, - (unsigned long long)cmd->size - asize, err); + pr_err("%d:%s: offset: %lld, data size: %llu, err: %d\n", + cmd->id.group_id, pohmelfs_dump_id(pi->id.id), + t->io_offset - asize + t->cmd.p.io.offset, + (unsigned long long)cmd->size - asize, err); return err; } @@ -530,8 +536,10 @@ static int pohmelfs_readpages_send_list(struct address_space *mapping, struct li rp->page_num = i; err = pohmelfs_readpages_send(pi, rp); - pr_debug("pohmelfs: %s: readpages: ino: %lu, offset: %lu, pages: %u/%u: %d\n", - pohmelfs_dump_id(pi->id.id), inode->i_ino, (long)page_offset(rp->pages[0]), rp->page_num, num, err); + pr_debug("%s: ino: %lu, offset: %lu, pages: %u/%u: %d\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, + (long)page_offset(rp->pages[0]), + rp->page_num, num, err); } kref_put(&rp->refcnt, pohmelfs_readpages_free); @@ -564,8 +572,10 @@ static int pohmelfs_readpages(struct file *filp, struct address_space *mapping, list_for_each_entry_safe_reverse(page, tmp, page_list, lru) { if (idx != page->index) { struct pohmelfs_inode *pi = pohmelfs_inode(mapping->host); - pr_debug("pohmelfs: %s: readpage index mismatch: want: %ld, page-index: %ld, total: %d\n", - pohmelfs_dump_id(pi->id.id), (long)idx, (long)page->index, nr_pages); + pr_debug("%s: index mismatch: want: %ld, page-index: %ld, total: %d\n", + pohmelfs_dump_id(pi->id.id), + (long)idx, (long)page->index, + nr_pages); break; } @@ -611,9 +621,9 @@ static int pohmelfs_readpage(struct file *file, struct page *page) kref_put(&rp->refcnt, pohmelfs_readpages_free); err_out_exit: if (err < 0) - pr_err("pohmelfs: %s: readpage: ino: %lu, offset: %lu, uptodate: %d, err: %d\n", - pohmelfs_dump_id(pi->id.id), inode->i_ino, (long)page_offset(page), - PageUptodate(page), err); + pr_err("%s: %s: ino: %lu, offset: %lu, uptodate: %d, err: %d\n", + __func__, pohmelfs_dump_id(pi->id.id), inode->i_ino, + (long)page_offset(page), PageUptodate(page), err); return err; } @@ -635,10 +645,10 @@ void pohmelfs_write_ctl_release(struct kref *kref) struct pohmelfs_inode *pi = pohmelfs_inode(inode); unsigned long long offset = page_offset(ctl->pvec.pages[0]); - pr_debug("pohmelfs: %s: bad write: ino: %lu, isize: %llu, offset: %llu: writes: %d/%d\n", - pohmelfs_dump_id(pi->id.id), - inode->i_ino, inode->i_size, offset, - atomic_read(&ctl->good_writes), psb->group_num); + pr_debug("%s: bad write: ino: %lu, isize: %llu, offset: %llu: writes: %d/%d\n", + pohmelfs_dump_id(pi->id.id), + inode->i_ino, inode->i_size, offset, + atomic_read(&ctl->good_writes), psb->group_num); mapping_set_error(mapping, -EIO); } @@ -769,9 +779,10 @@ static int pohmelfs_writepages(struct address_space *mapping, struct writeback_c index = wbc->range_start >> PAGE_CACHE_SHIFT; end = wbc->range_end >> PAGE_CACHE_SHIFT; - pr_debug("pohmelfs: %s: writepages: ino: %ld, nr: %ld, index: %llu, end: %llu, total_size: %lu, sync: %d\n", - pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), inode->i_ino, - wbc->nr_to_write, wbc->range_start, wbc->range_end, (unsigned long)inode->i_size, wbc->sync_mode); + pr_debug("%s: ino: %ld, nr: %ld, index: %llu, end: %llu, total_size: %lu, sync: %d\n", + pohmelfs_dump_id(pohmelfs_inode(inode)->id.id), inode->i_ino, + wbc->nr_to_write, wbc->range_start, wbc->range_end, + (unsigned long)inode->i_size, wbc->sync_mode); if (wbc->range_cyclic) { start = mapping->writeback_index; /* Start from prev offset */ @@ -839,7 +850,8 @@ retry: if (test_and_clear_bit(AS_EIO, &mapping->flags)) err = -EIO; err_out_exit: - pr_debug("pohmelfs: %s: metadata write complete: %d\n", pohmelfs_dump_id(pi->id.id), err); + pr_debug("%s: metadata write complete: %d\n", + pohmelfs_dump_id(pi->id.id), err); return err; } @@ -903,13 +915,15 @@ void pohmelfs_fill_inode_info(struct inode *inode, struct pohmelfs_inode_info *i void pohmelfs_fill_inode(struct inode *inode, struct pohmelfs_inode_info *info) { - pr_debug("pohmelfs: %s: ino: %lu inode is regular: %d, dir: %d, link: %d, mode: %o, " - "namelen: %u, size: %llu, state: %lx, mtime: %llu.%llu/%lu.%lu\n", - pohmelfs_dump_id(info->id.id), inode->i_ino, - S_ISREG(inode->i_mode), S_ISDIR(inode->i_mode), - S_ISLNK(inode->i_mode), inode->i_mode, info->namelen, inode->i_size, inode->i_state, - (unsigned long long)info->mtime.tsec, (unsigned long long)info->mtime.tnsec, - inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec); + pr_debug("%s: ino: %lu inode is regular: %d, dir: %d, link: %d, mode: %o, " + "namelen: %u, size: %llu, state: %lx, mtime: %llu.%llu/%lu.%lu\n", + pohmelfs_dump_id(info->id.id), inode->i_ino, + S_ISREG(inode->i_mode), S_ISDIR(inode->i_mode), + S_ISLNK(inode->i_mode), inode->i_mode, info->namelen, + inode->i_size, inode->i_state, + (unsigned long long)info->mtime.tsec, + (unsigned long long)info->mtime.tnsec, + inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec); if (info->mtime.tsec < inode->i_mtime.tv_sec) return; diff --git a/fs/pohmelfs/net.c b/fs/pohmelfs/net.c index 4d380a65194..79079392a06 100644 --- a/fs/pohmelfs/net.c +++ b/fs/pohmelfs/net.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -26,11 +28,11 @@ void pohmelfs_print_addr(struct sockaddr_storage *addr, const char *fmt, ...) if (sa->sa_family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in *)addr; - pr_info("pohmelfs: %pI4:%d: %pV", + pr_info("%pI4:%d: %pV", &sin->sin_addr.s_addr, ntohs(sin->sin_port), &vaf); } else if (sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin = (struct sockaddr_in6 *)addr; - pr_info("pohmelfs: %pI6:%d: %pV", + pr_info("%pI6:%d: %pV", &sin->sin6_addr, ntohs(sin->sin6_port), &vaf); } @@ -184,11 +186,12 @@ static int pohmelfs_page_send(struct pohmelfs_trans *t) err = kernel_sendpage(t->st->sock, page, current_io_offset - skip_offset, sz, MSG_DONTWAIT); - pr_debug("pohmelfs: %s: %d/%d: total-size: %llu, io-offset: %llu, rest-size: %zd, current-io: %zd, " - "skip-offset: %zd, sz: %zu: %d\n", - pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), i, pagevec_count(&ctl->pvec), - (unsigned long long)le64_to_cpu(t->cmd.cmd.size) + sizeof(struct dnet_cmd), - t->io_offset, size, current_io_offset, skip_offset, sz, err); + pr_debug("%s: %d/%d: total-size: %llu, io-offset: %llu, rest-size: %zd, current-io: %zd, skip-offset: %zd, sz: %zu: %d\n", + pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), + i, pagevec_count(&ctl->pvec), + (unsigned long long)le64_to_cpu(t->cmd.cmd.size) + sizeof(struct dnet_cmd), + t->io_offset, size, current_io_offset, + skip_offset, sz, err); if (err <= 0) { if (err == 0) @@ -292,14 +295,18 @@ static int pohmelfs_state_send(struct pohmelfs_state *st) goto err_out_exit; size = le64_to_cpu(t->cmd.cmd.size) + sizeof(struct dnet_cmd); - pr_debug("pohmelfs: %s: starting sending: %llu/%zd\n", pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), t->io_offset, size); + pr_debug("%s: starting sending: %llu/%zd\n", + pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), + t->io_offset, size); if (t->wctl) err = pohmelfs_page_send(t); else err = pohmelfs_data_send(t); - pr_debug("pohmelfs: %s: sent: %llu/%zd: %d\n", pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), t->io_offset, size, err); + pr_debug("%s: sent: %llu/%zd: %d\n", + pohmelfs_dump_id(pohmelfs_inode(t->inode)->id.id), + t->io_offset, size, err); if (!err && (t->io_offset == size)) { mutex_lock(&st->trans_lock); list_del_init(&t->trans_entry); @@ -327,7 +334,7 @@ static void pohmelfs_suck_scratch(struct pohmelfs_state *st) struct dnet_cmd *cmd = &st->cmd; int err = 0; - pr_debug("pohmelfs_suck_scratch: %llu\n", (unsigned long long)cmd->size); + pr_debug("%llu\n", (unsigned long long)cmd->size); while (cmd->size) { int sz = pohmelfs_scratch_buf_size; diff --git a/fs/pohmelfs/route.c b/fs/pohmelfs/route.c index d8592fb3d5c..c6a47557049 100644 --- a/fs/pohmelfs/route.c +++ b/fs/pohmelfs/route.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include @@ -143,7 +145,8 @@ struct pohmelfs_state *pohmelfs_state_lookup(struct pohmelfs_sb *psb, struct dne psb->meta_idx = 0; } - pr_debug("pohmelfs: %s: selected connection: %d, group: %d, size: %zd\n", pohmelfs_dump_id(id->id), idx, group_id, size); + pr_debug("%s: selected connection: %d, group: %d, size: %zd\n", + pohmelfs_dump_id(id->id), idx, group_id, size); c = &psb->conn[idx]; st = pohmelfs_state_lookup_connection(c, id, group_id); @@ -354,7 +357,7 @@ int pohmelfs_route_request(struct pohmelfs_state *st) err = pohmelfs_send_buf_single(pio, st); if (err) { - pohmelfs_print_addr(&st->sa, "pohmelfs: pohmelfs_route_request: %d\n", err); + pohmelfs_print_addr(&st->sa, "%s: %d\n", __func__, err); goto err_out_free; } pohmelfs_print_addr(&st->sa, "route request sent\n"); diff --git a/fs/pohmelfs/stat.c b/fs/pohmelfs/stat.c index bf13d03a32d..100176052ca 100644 --- a/fs/pohmelfs/stat.c +++ b/fs/pohmelfs/stat.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "pohmelfs.h" static int pohmelfs_stat_init(struct pohmelfs_trans *t) @@ -51,10 +53,10 @@ static int pohmelfs_stat_complete(struct pohmelfs_trans *t, struct pohmelfs_stat recv->bfree = stat->bfree; recv->bavail = stat->bavail; - pr_debug("pohmelfs: %s: pohmelfs_stat_complete: total: %llu, avail: %llu\n", - pohmelfs_dump_id(cmd->id.id), - (unsigned long long)(stat->frsize * stat->blocks / 1024 / 1024), - (unsigned long long)(stat->bavail * stat->bsize / 1024 / 1024)); + pr_debug("%s: total: %llu, avail: %llu\n", + pohmelfs_dump_id(cmd->id.id), + (unsigned long long)(stat->frsize * stat->blocks / 1024 / 1024), + (unsigned long long)(stat->bavail * stat->bsize / 1024 / 1024)); } err_out_exit: diff --git a/fs/pohmelfs/super.c b/fs/pohmelfs/super.c index 7efa836e664..c719937f6d4 100644 --- a/fs/pohmelfs/super.c +++ b/fs/pohmelfs/super.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -262,7 +264,8 @@ static int pohmelfs_drop_inode(struct inode *inode) struct pohmelfs_inode *pi = pohmelfs_inode(inode); struct pohmelfs_sb *psb = pohmelfs_sb(inode->i_sb); - pr_debug("pohmelfs: %s: drop ino: %ld, mapping: %p\n", pohmelfs_dump_id(pi->id.id), inode->i_ino, inode->i_mapping); + pr_debug("%s: %ld, mapping: %p\n", + pohmelfs_dump_id(pi->id.id), inode->i_ino, inode->i_mapping); spin_lock(&psb->inode_lock); if (rb_parent(&pi->node) != &pi->node) @@ -554,7 +557,8 @@ static int pohmelfs_parse_addr(char *addr, struct sockaddr_storage *a, int *addr return 0; err_out_print_wrong_param: - pr_err("pohmelfs: %s: wrong addr: '%s', should be 'addr:port:family': %d.\n", __func__, addr, err); + pr_err("%s: wrong addr: '%s', should be 'addr:port:family': %d\n", + __func__, addr, err); return err; } @@ -635,7 +639,7 @@ static int pohmelfs_parse_option(struct pohmelfs_sb *psb, char *data) int len; int err = 0; - pr_debug("pohmelfs: %s: option: %s\n", __func__, data); + pr_debug("option: %s\n", data); if (pohmelfs_option("server=", data, &len, 1)) { struct pohmelfs_addr *a, *tmp; @@ -800,7 +804,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent) if (!psb->group_num || list_empty(&psb->addr_list)) { err = -EINVAL; - pr_err("pohmelfs: you have to specify number of groups and add remote node address (at least one)\n"); + pr_err("you have to specify number of groups and add remote node address (at least one)\n"); goto err_out_put_root; } @@ -839,7 +843,7 @@ err_out_free_bdi: err_out_free_psb: kfree(psb); err_out_exit: - pr_err("pohmelfs: %s: error: %d\n", __func__, err); + pr_err("%s: error: %d\n", __func__, err); return err; } diff --git a/fs/pohmelfs/trans.c b/fs/pohmelfs/trans.c index b8c891677db..8fb9bf1e859 100644 --- a/fs/pohmelfs/trans.c +++ b/fs/pohmelfs/trans.c @@ -2,6 +2,8 @@ * Copyright (C) 2011+ Evgeniy Polyakov */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include @@ -19,8 +21,9 @@ static void pohmelfs_trans_release(struct kref *kref) struct pohmelfs_trans *t = container_of(kref, struct pohmelfs_trans, refcnt); struct pohmelfs_inode *pi = pohmelfs_inode(t->inode); - pr_debug("pohmelfs: %s: trans freed: %lu, io_offset: %llu, ino: %ld\n", - pohmelfs_dump_id(pi->id.id), t->trans, t->io_offset, t->inode->i_ino); + pr_debug("%s: %lu, io_offset: %llu, ino: %ld\n", + pohmelfs_dump_id(pi->id.id), t->trans, t->io_offset, + t->inode->i_ino); if (t->cb.destroy) t->cb.destroy(t); @@ -70,8 +73,8 @@ static int pohmelfs_buf_complete(struct pohmelfs_trans *t, struct pohmelfs_state struct dnet_cmd *cmd = &recv->cmd; unsigned long long trans = cmd->trans & ~DNET_TRANS_REPLY; - pr_debug("pohmelfs: %s: trans complete: %llu, flags: %x\n", - pohmelfs_dump_id(pi->id.id), trans, cmd->flags); + pr_debug("%s: %llu, flags: %x\n", + pohmelfs_dump_id(pi->id.id), trans, cmd->flags); return 0; } -- 2.11.4.GIT