[pnfs] [PATCH 4/4] [SQUASHME] pnfs: fix misc dprintks

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4filelayout.c    |    4 ++--
 fs/nfs/nfs4filelayoutdev.c |    4 ++--
 fs/nfs/nfs4proc.c          |    4 ++--
 fs/nfs/pnfs.c              |    5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 27d5b17..ef4cfcb 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -730,8 +730,8 @@ boundary:
 	do_div(r_stripe, pgio->pg_boundary);
 
 #if 0
-	dprintk("%s p %llu r %llu bnd %d bsize %Zu\n",
-	__func__, p_stripe, r_stripe, pgio->pg_boundary, pgio->pg_bsize);
+	dprintk("%s p %llu r %llu bnd %d bsize %Zu\n", __func__,
+		p_stripe, r_stripe, pgio->pg_boundary, pgio->pg_bsize);
 #endif
 
 	return (p_stripe == r_stripe);
diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 3d01b2f..9468d0c 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -761,7 +761,7 @@ nfs4_pnfs_dserver_get(struct pnfs_layout_segment *lseg,
 	dserver->dev = &di->stripe_devs[stripe_idx];
 	if (dserver->dev == NULL) {
 		printk(KERN_ERR "%s: No data server for device id (%s)!! \n",
-		__func__, deviceid_fmt(&layout->dev_id));
+			__func__, deviceid_fmt(&layout->dev_id));
 		return 1;
 	}
 	if (layout->num_fh == 1)
@@ -769,7 +769,7 @@ nfs4_pnfs_dserver_get(struct pnfs_layout_segment *lseg,
 	else
 		dserver->fh = &layout->fh_array[stripe_idx];
 
-	dprintk("%s: dev_id=%s ip:port=%s, idx=%u, offset=%Lu, count=%Zu\n",
+	dprintk("%s: dev_id=%s, ip:port=%s, idx=%u, offset=%Lu, count=%Zu\n",
 		__func__, deviceid_fmt(&layout->dev_id),
 		dserver->dev->ds_list[0]->r_addr,
 		stripe_idx, offset, count);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a56a89c..7c3bc50 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2999,7 +2999,7 @@ static int pnfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
 
 	/* Is this a DS session */
 	if (data->ds_nfs_client) {
-		dprintk("%s DS read\n", __func__);
+		dprintk("%s DS write\n", __func__);
 		session = data->ds_nfs_client->cl_ds_session;
 		client = NULL; /* do not update mds lease...*/
 	}
@@ -3052,7 +3052,7 @@ static int pnfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data)
 
 	/* Is this a DS session */
 	if (data->ds_nfs_client) {
-		dprintk("%s DS write\n", __func__);
+		dprintk("%s DS read\n", __func__);
 		session = data->ds_nfs_client->cl_ds_session;
 		client = NULL; /* do not update mds lease...*/
 	}
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 5b6511b..afb3d71 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -47,7 +47,6 @@
 #include <linux/nfs4_pnfs.h>
 
 #include "internal.h"
-
 #include "nfs4_fs.h"
 #include "pnfs.h"
 
@@ -253,8 +252,8 @@ pnfs_register_layoutdriver(struct pnfs_layoutdriver_type *ld_type)
 	struct layoutdriver_io_operations *io_ops = ld_type->ld_io_ops;
 
 	if (!pnfs_initialized) {
-		printk(KERN_ERR "%s Registration failure."
-		       "  pNFS not initialized.\n", __func__);
+		printk(KERN_ERR "%s Registration failure. "
+		       "pNFS not initialized.\n", __func__);
 		return NULL;
 	}
 
-- 
1.5.3.3