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

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

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

fs/nfs/write.c

+14 −13
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ int nfs_updatepage(struct file *file, struct page *page, 


	nfs_inc_stats(inode, NFSIOS_VFSUPDATEPAGE);



	dprintk("NFS:      nfs_updatepage(%s/%s %d@%Ld)\n",

	dprintk("NFS:       nfs_updatepage(%s/%s %d@%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));
@@ -736,7 +736,7 @@ int nfs_updatepage(struct file *file, struct page *page, 
	else

		__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));

	return status;

}
@@ -821,7 +821,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),
@@ -965,13 +965,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 %d@%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 %d@%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);

}
@@ -1045,7 +1045,8 @@ static void nfs_writeback_release_full(void *calldata) 


		nfs_list_remove_request(req);



		dprintk("NFS: write (%s/%Ld %d@%Ld)",

		dprintk("NFS: %5u write (%s/%lld %d@%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,
@@ -1287,7 +1288,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 %d@%Ld)",

		dprintk("NFS:       commit (%s/%lld %d@%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,