2008-06-11 21:57:47

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 6/7] NFS: Fix trace debugging nits in write.c

Clean up: fix a few dprintk messages that still need to show the RPC task ID
correctly, and be sure we use the preferred %lld or %llu instead of %Ld or
%Lu.

Signed-off-by: Chuck Lever <[email protected]>
---

fs/nfs/write.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)


diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 6d8ace3..618fc56 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -721,10 +721,10 @@ int nfs_updatepage(struct file *file, struct page *page,

nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE);

- dprintk("NFS: nfs_updatepage(%s/%s %[email protected]%Ld)\n",
+ dprintk("NFS: nfs_updatepage(%s/%s %[email protected]%lld)\n",
file->f_path.dentry->d_parent->d_name.name,
file->f_path.dentry->d_name.name, count,
- (long long)(page_offset(page) +offset));
+ (long long)(page_offset(page) + offset));

/* If we're not using byte range locks, and we know the page
* is up to date, it may be more efficient to extend the write
@@ -741,7 +741,7 @@ int nfs_updatepage(struct file *file, struct page *page,
status = nfs_writepage_setup(ctx, page, offset, count);
__set_page_dirty_nobuffers(page);

- dprintk("NFS: nfs_updatepage returns %d (isize %Ld)\n",
+ dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n",
status, (long long)i_size_read(inode));
if (status < 0)
nfs_set_pageerror(page);
@@ -833,7 +833,7 @@ static int nfs_write_rpcsetup(struct nfs_page *req,
NFS_PROTO(inode)->write_setup(data, &msg);

dprintk("NFS: %5u initiated write call "
- "(req %s/%Ld, %u bytes @ offset %Lu)\n",
+ "(req %s/%lld, %u bytes @ offset %llu)\n",
data->task.tk_pid,
inode->i_sb->s_id,
(long long)NFS_FILEID(inode),
@@ -977,13 +977,13 @@ static void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,
static void nfs_writeback_done_partial(struct rpc_task *task, void *calldata)
{
struct nfs_write_data *data = calldata;
- struct nfs_page *req = data->req;

- dprintk("NFS: write (%s/%Ld %[email protected]%Ld)",
- req->wb_context->path.dentry->d_inode->i_sb->s_id,
- (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
- req->wb_bytes,
- (long long)req_offset(req));
+ dprintk("NFS: %5u write(%s/%lld %[email protected]%lld)",
+ task->tk_pid,
+ data->req->wb_context->path.dentry->d_inode->i_sb->s_id,
+ (long long)
+ NFS_FILEID(data->req->wb_context->path.dentry->d_inode),
+ data->req->wb_bytes, (long long)req_offset(data->req));

nfs_writeback_done(task, data);
}
@@ -1057,7 +1057,8 @@ static void nfs_writeback_release_full(void *calldata)

nfs_list_remove_request(req);

- dprintk("NFS: write (%s/%Ld %[email protected]%Ld)",
+ dprintk("NFS: %5u write (%s/%lld %[email protected]%lld)",
+ data->task.tk_pid,
req->wb_context->path.dentry->d_inode->i_sb->s_id,
(long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
req->wb_bytes,
@@ -1132,7 +1133,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
static unsigned long complain;

if (time_before(complain, jiffies)) {
- dprintk("NFS: faulty NFS server %s:"
+ dprintk("NFS: faulty NFS server %s:"
" (committed = %d) != (stable = %d)\n",
NFS_SERVER(data->inode)->nfs_client->cl_hostname,
resp->verf->committed, argp->stable);
@@ -1301,7 +1302,7 @@ static void nfs_commit_release(void *calldata)
dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
BDI_RECLAIMABLE);

- dprintk("NFS: commit (%s/%Ld %[email protected]%Ld)",
+ dprintk("NFS: commit (%s/%lld %[email protected]%lld)",
req->wb_context->path.dentry->d_inode->i_sb->s_id,
(long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
req->wb_bytes,