aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-01-31 12:14:01 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-03 18:35:09 -0500
commita3f565b1e530a756472401835107d08fd291f242 (patch)
tree84a15e4810f63689e3f85bbbc6497ee41934705e /fs/nfs
parent4dc2eaecd4cf0687727e418540bccf956a62ebcf (diff)
NFS: fix print format for tk_pid
The tk_pid field is an unsigned short. The proper print format specifier for that type is %5u, not %4d. Also clean up some miscellaneous print formatting nits. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/direct.c8
-rw-r--r--fs/nfs/read.c4
-rw-r--r--fs/nfs/write.c9
3 files changed, 12 insertions, 9 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index bd21d7fde650..b1c98ea39b72 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -309,7 +309,8 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo
309 309
310 rpc_execute(&data->task); 310 rpc_execute(&data->task);
311 311
312 dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n", 312 dprintk("NFS: %5u initiated direct read call "
313 "(req %s/%Ld, %zu bytes @ offset %Lu)\n",
313 data->task.tk_pid, 314 data->task.tk_pid,
314 inode->i_sb->s_id, 315 inode->i_sb->s_id,
315 (long long)NFS_FILEID(inode), 316 (long long)NFS_FILEID(inode),
@@ -639,7 +640,8 @@ static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned l
639 640
640 rpc_execute(&data->task); 641 rpc_execute(&data->task);
641 642
642 dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n", 643 dprintk("NFS: %5u initiated direct write call "
644 "(req %s/%Ld, %zu bytes @ offset %Lu)\n",
643 data->task.tk_pid, 645 data->task.tk_pid,
644 inode->i_sb->s_id, 646 inode->i_sb->s_id,
645 (long long)NFS_FILEID(inode), 647 (long long)NFS_FILEID(inode),
@@ -797,7 +799,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
797 const char __user *buf = iov[0].iov_base; 799 const char __user *buf = iov[0].iov_base;
798 size_t count = iov[0].iov_len; 800 size_t count = iov[0].iov_len;
799 801
800 dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n", 802 dprintk("nfs: direct write(%s/%s, %lu@%Ld)\n",
801 file->f_path.dentry->d_parent->d_name.name, 803 file->f_path.dentry->d_parent->d_name.name,
802 file->f_path.dentry->d_name.name, 804 file->f_path.dentry->d_name.name,
803 (unsigned long) count, (long long) pos); 805 (unsigned long) count, (long long) pos);
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 4affb536ada3..6ab4d5a9edf2 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -183,7 +183,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
183 183
184 data->task.tk_cookie = (unsigned long)inode; 184 data->task.tk_cookie = (unsigned long)inode;
185 185
186 dprintk("NFS: %4d initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n", 186 dprintk("NFS: %5u initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n",
187 data->task.tk_pid, 187 data->task.tk_pid,
188 inode->i_sb->s_id, 188 inode->i_sb->s_id,
189 (long long)NFS_FILEID(inode), 189 (long long)NFS_FILEID(inode),
@@ -357,7 +357,7 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data)
357{ 357{
358 int status; 358 int status;
359 359
360 dprintk("%s: %4d, (status %d)\n", __FUNCTION__, task->tk_pid, 360 dprintk("NFS: %s: %5u, (status %d)\n", __FUNCTION__, task->tk_pid,
361 task->tk_status); 361 task->tk_status);
362 362
363 status = NFS_PROTO(data->inode)->read_done(task, data); 363 status = NFS_PROTO(data->inode)->read_done(task, data);
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e9eff9376dc0..dea17375eb30 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -793,7 +793,8 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
793 data->task.tk_priority = flush_task_priority(how); 793 data->task.tk_priority = flush_task_priority(how);
794 data->task.tk_cookie = (unsigned long)inode; 794 data->task.tk_cookie = (unsigned long)inode;
795 795
796 dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n", 796 dprintk("NFS: %5u initiated write call "
797 "(req %s/%Ld, %u bytes @ offset %Lu)\n",
797 data->task.tk_pid, 798 data->task.tk_pid,
798 inode->i_sb->s_id, 799 inode->i_sb->s_id,
799 (long long)NFS_FILEID(inode), 800 (long long)NFS_FILEID(inode),
@@ -1075,7 +1076,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data)
1075 struct nfs_writeres *resp = &data->res; 1076 struct nfs_writeres *resp = &data->res;
1076 int status; 1077 int status;
1077 1078
1078 dprintk("NFS: %4d nfs_writeback_done (status %d)\n", 1079 dprintk("NFS: %5u nfs_writeback_done (status %d)\n",
1079 task->tk_pid, task->tk_status); 1080 task->tk_pid, task->tk_status);
1080 1081
1081 /* 1082 /*
@@ -1191,7 +1192,7 @@ static void nfs_commit_rpcsetup(struct list_head *head,
1191 data->task.tk_priority = flush_task_priority(how); 1192 data->task.tk_priority = flush_task_priority(how);
1192 data->task.tk_cookie = (unsigned long)inode; 1193 data->task.tk_cookie = (unsigned long)inode;
1193 1194
1194 dprintk("NFS: %4d initiated commit call\n", data->task.tk_pid); 1195 dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);
1195} 1196}
1196 1197
1197/* 1198/*
@@ -1232,7 +1233,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)
1232 struct nfs_write_data *data = calldata; 1233 struct nfs_write_data *data = calldata;
1233 struct nfs_page *req; 1234 struct nfs_page *req;
1234 1235
1235 dprintk("NFS: %4d nfs_commit_done (status %d)\n", 1236 dprintk("NFS: %5u nfs_commit_done (status %d)\n",
1236 task->tk_pid, task->tk_status); 1237 task->tk_pid, task->tk_status);
1237 1238
1238 /* Call the NFS version-specific code */ 1239 /* Call the NFS version-specific code */