Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3f565b1 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4dc2eaec

fs/nfs/direct.c

+5 −3
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo 


		rpc_execute(&data->task);



		dfprintk(VFS, "NFS: %5u initiated direct read call (req %s/%Ld, %zu bytes @ offset %Lu)\n",

		dprintk("NFS: %5u initiated direct read call "

			"(req %s/%Ld, %zu bytes @ offset %Lu)\n",

				data->task.tk_pid,

				inode->i_sb->s_id,

				(long long)NFS_FILEID(inode),
@@ -639,7 +640,8 @@ static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned l 


		rpc_execute(&data->task);



		dfprintk(VFS, "NFS: %5u initiated direct write call (req %s/%Ld, %zu bytes @ offset %Lu)\n",

		dprintk("NFS: %5u initiated direct write call "

			"(req %s/%Ld, %zu bytes @ offset %Lu)\n",

				data->task.tk_pid,

				inode->i_sb->s_id,

				(long long)NFS_FILEID(inode),
@@ -797,7 +799,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, 
	const char __user *buf = iov[0].iov_base;

	size_t count = iov[0].iov_len;



	dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n",

	dprintk("nfs: direct write(%s/%s, %lu@%Ld)\n",

		file->f_path.dentry->d_parent->d_name.name,

		file->f_path.dentry->d_name.name,

		(unsigned long) count, (long long) pos);

fs/nfs/read.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data, 


	data->task.tk_cookie = (unsigned long)inode;



	dprintk("NFS: %4d initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n",

	dprintk("NFS: %5u initiated read call (req %s/%Ld, %u bytes @ offset %Lu)\n",

			data->task.tk_pid,

			inode->i_sb->s_id,

			(long long)NFS_FILEID(inode),
@@ -357,7 +357,7 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data) 
{

	int status;



	dprintk("%s: %4d, (status %d)\n", __FUNCTION__, task->tk_pid,

	dprintk("NFS: %s: %5u, (status %d)\n", __FUNCTION__, task->tk_pid,

			task->tk_status);



	status = NFS_PROTO(data->inode)->read_done(task, data);

fs/nfs/write.c

+5 −4
Original line number Diff line number Diff line
@@ -793,7 +793,8 @@ static void nfs_write_rpcsetup(struct nfs_page *req, 
	data->task.tk_priority = flush_task_priority(how);

	data->task.tk_cookie = (unsigned long)inode;



	dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n",

	dprintk("NFS: %5u initiated write call "

		"(req %s/%Ld, %u bytes @ offset %Lu)\n",

		data->task.tk_pid,

		inode->i_sb->s_id,

		(long long)NFS_FILEID(inode),
@@ -1075,7 +1076,7 @@ int nfs_writeback_done(struct rpc_task *task, struct nfs_write_data *data) 
	struct nfs_writeres	*resp = &data->res;

	int status;



	dprintk("NFS: %4d nfs_writeback_done (status %d)\n",

	dprintk("NFS: %5u nfs_writeback_done (status %d)\n",

		task->tk_pid, task->tk_status);



	/*
@@ -1191,7 +1192,7 @@ static void nfs_commit_rpcsetup(struct list_head *head, 
	data->task.tk_priority = flush_task_priority(how);

	data->task.tk_cookie = (unsigned long)inode;

	

	dprintk("NFS: %4d initiated commit call\n", data->task.tk_pid);

	dprintk("NFS: %5u initiated commit call\n", data->task.tk_pid);

}



/*
@@ -1232,7 +1233,7 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) 
	struct nfs_write_data	*data = calldata;

	struct nfs_page		*req;



        dprintk("NFS: %4d nfs_commit_done (status %d)\n",

        dprintk("NFS: %5u nfs_commit_done (status %d)\n",

                                task->tk_pid, task->tk_status);



	/* Call the NFS version-specific code */