[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.	2006/11/28 02:58:35

Modified files:
	cvs/pnfs/fs/nfs: pnfs.c 

Log message:
- Fix printf formats for size_t arguments
- "status" in pnfs_commit_done() should be ssize_t rather than int

Signed-off-by: Benny Halevy bhalevy at panasas.com

Index: fs/nfs/pnfs.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfs/pnfs.c,v
retrieving revision 1.43
diff -u -r1.43 pnfs.c
--- fs/nfs/pnfs.c	13 Oct 2006 05:54:30 -0000	1.43
+++ fs/nfs/pnfs.c	28 Nov 2006 07:53:57 -0000
@@ -517,13 +517,13 @@

if (iswrite && nfss->pnfs_curr_ld->ld_policy_ops->get_write_threshold) {
threshold = nfss->pnfs_curr_ld->ld_policy_ops->get_write_threshold(nfsi->current_layout, inode);
-		dprintk("%s wthresh: %d\n",__FUNCTION__, threshold);
+		dprintk("%s wthresh: %Zd\n",__FUNCTION__, threshold);
goto check;
}

if (!iswrite && nfss->pnfs_curr_ld->ld_policy_ops->get_read_threshold) {
threshold = nfss->pnfs_curr_ld->ld_policy_ops->get_read_threshold(nfsi->current_layout, inode);
-		dprintk("%s rthresh: %d\n",__FUNCTION__, threshold);
+		dprintk("%s rthresh: %Zd\n",__FUNCTION__, threshold);
}

check:
@@ -684,7 +684,7 @@
static void
pnfs_writeback_done(struct nfs_write_data *data, ssize_t status)
{
-	dprintk("%s: Begin (status %d)\n",__FUNCTION__, status);
+	dprintk("%s: Begin (status %Zd)\n",__FUNCTION__, status);

/* NFSv4 will have sunrpc call the callbacks */
if (data->call_ops == NULL ||
@@ -771,7 +771,7 @@
static void
pnfs_read_done(struct nfs_read_data* data, ssize_t status, int eof)
{
-	dprintk("%s: Begin (status %d)\n",__FUNCTION__, status);
+	dprintk("%s: Begin (status %Zd)\n",__FUNCTION__, status);

/* NFSv4 will have sunrpc call the callbacks */
if (data->call_ops == NULL ||
@@ -1026,9 +1026,9 @@

/* pNFS Commit callback function for non-file layout drivers */
static void
-pnfs_commit_done(struct nfs_write_data *data, int status)
+pnfs_commit_done(struct nfs_write_data *data, ssize_t status)
{
-	dprintk("%s: Begin (status %d)\n",__FUNCTION__, status);
+	dprintk("%s: Begin (status %Zd)\n",__FUNCTION__, status);

/* NFSv4 will have sunrpc call the callbacks */
if (pnfs_use_nfsv4_wproto(data->inode, -1))
@@ -1070,7 +1070,7 @@
result = nfss->pnfs_curr_ld->ld_io_ops->commit(nfsi->current_layout,
inode, head, sync, data);

-	dprintk("%s end (err:%Zd)\n",__FUNCTION__,result);
+	dprintk("%s end (err:%d)\n",__FUNCTION__,result);
return result;
}

@@ -1120,7 +1120,7 @@
datasync);

out:
-	dprintk("%s end (err:%Zd)\n",__FUNCTION__,result);
+	dprintk("%s end (err:%d)\n",__FUNCTION__,result);
return result;
}