aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-06-11 17:56:05 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-09 12:09:05 -0400
commit48186c7d5734a6b137f9186b37f6dc98097d0429 (patch)
tree3fc31d6d71a9160e50ea1c4e9afaefe9b4aefd80 /fs/nfs/write.c
parent6da24bc9cfc645c619992e39aab09747164c9f14 (diff)
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 <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index ee6fcdecb871..21d8a48b624b 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -713,10 +713,10 @@ int nfs_updatepage(struct file *file, struct page *page,
713 713
714 nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE); 714 nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE);
715 715
716 dprintk("NFS: nfs_updatepage(%s/%s %d@%Ld)\n", 716 dprintk("NFS: nfs_updatepage(%s/%s %d@%lld)\n",
717 file->f_path.dentry->d_parent->d_name.name, 717 file->f_path.dentry->d_parent->d_name.name,
718 file->f_path.dentry->d_name.name, count, 718 file->f_path.dentry->d_name.name, count,
719 (long long)(page_offset(page) +offset)); 719 (long long)(page_offset(page) + offset));
720 720
721 /* If we're not using byte range locks, and we know the page 721 /* If we're not using byte range locks, and we know the page
722 * is up to date, it may be more efficient to extend the write 722 * is up to date, it may be more efficient to extend the write
@@ -736,7 +736,7 @@ int nfs_updatepage(struct file *file, struct page *page,
736 else 736 else
737 __set_page_dirty_nobuffers(page); 737 __set_page_dirty_nobuffers(page);
738 738
739 dprintk("NFS: nfs_updatepage returns %d (isize %Ld)\n", 739 dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n",
740 status, (long long)i_size_read(inode)); 740 status, (long long)i_size_read(inode));
741 return status; 741 return status;
742} 742}
@@ -821,7 +821,7 @@ static int nfs_write_rpcsetup(struct nfs_page *req,
821 NFS_PROTO(inode)->write_setup(data, &msg); 821 NFS_PROTO(inode)->write_setup(data, &msg);
822 822
823 dprintk("NFS: %5u initiated write call " 823 dprintk("NFS: %5u initiated write call "
824 "(req %s/%Ld, %u bytes @ offset %Lu)\n", 824 "(req %s/%lld, %u bytes @ offset %llu)\n",
825 data->task.tk_pid, 825 data->task.tk_pid,
826 inode->i_sb->s_id, 826 inode->i_sb->s_id,
827 (long long)NFS_FILEID(inode), 827 (long long)NFS_FILEID(inode),
@@ -965,13 +965,13 @@ static void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio,
965static void nfs_writeback_done_partial(struct rpc_task *task, void *calldata) 965static void nfs_writeback_done_partial(struct rpc_task *task, void *calldata)
966{ 966{
967 struct nfs_write_data *data = calldata; 967 struct nfs_write_data *data = calldata;
968 struct nfs_page *req = data->req;
969 968
970 dprintk("NFS: write (%s/%Ld %d@%Ld)", 969 dprintk("NFS: %5u write(%s/%lld %d@%lld)",
971 req->wb_context->path.dentry->d_inode->i_sb->s_id, 970 task->tk_pid,
972 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode), 971 data->req->wb_context->path.dentry->d_inode->i_sb->s_id,
973 req->wb_bytes, 972 (long long)
974 (long long)req_offset(req)); 973 NFS_FILEID(data->req->wb_context->path.dentry->d_inode),
974 data->req->wb_bytes, (long long)req_offset(data->req));
975 975
976 nfs_writeback_done(task, data); 976 nfs_writeback_done(task, data);
977} 977}
@@ -1045,7 +1045,8 @@ static void nfs_writeback_release_full(void *calldata)
1045 1045
1046 nfs_list_remove_request(req); 1046 nfs_list_remove_request(req);
1047 1047
1048 dprintk("NFS: write (%s/%Ld %d@%Ld)", 1048 dprintk("NFS: %5u write (%s/%lld %d@%lld)",
1049 data->task.tk_pid,
1049 req->wb_context->path.dentry->d_inode->i_sb->s_id, 1050 req->wb_context->path.dentry->d_inode->i_sb->s_id,
1050 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode), 1051 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
1051 req->wb_bytes, 1052 req->wb_bytes,
@@ -1118,7 +1119,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1118 static unsigned long complain; 1119 static unsigned long complain;
1119 1120
1120 if (time_before(complain, jiffies)) { 1121 if (time_before(complain, jiffies)) {
1121 dprintk("NFS: faulty NFS server %s:" 1122 dprintk("NFS: faulty NFS server %s:"
1122 " (committed = %d) != (stable = %d)\n", 1123 " (committed = %d) != (stable = %d)\n",
1123 NFS_SERVER(data->inode)->nfs_client->cl_hostname, 1124 NFS_SERVER(data->inode)->nfs_client->cl_hostname,
1124 resp->verf->committed, argp->stable); 1125 resp->verf->committed, argp->stable);
@@ -1287,7 +1288,7 @@ static void nfs_commit_release(void *calldata)
1287 dec_bdi_stat(req->wb_page->mapping->backing_dev_info, 1288 dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
1288 BDI_RECLAIMABLE); 1289 BDI_RECLAIMABLE);
1289 1290
1290 dprintk("NFS: commit (%s/%Ld %d@%Ld)", 1291 dprintk("NFS: commit (%s/%lld %d@%lld)",
1291 req->wb_context->path.dentry->d_inode->i_sb->s_id, 1292 req->wb_context->path.dentry->d_inode->i_sb->s_id,
1292 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode), 1293 (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
1293 req->wb_bytes, 1294 req->wb_bytes,