[pnfs] [PATCH 15/17] [SQUASHME] nfs41: cosmetic cleanups to "sessions client infrastructure"

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4proc.c                      |    4 ++--
 fs/nfsd/nfs4callback.c                 |    2 ++
 include/linux/nfs41_session_recovery.h |    1 -
 include/linux/nfs_fs_sb.h              |    4 ++--
 include/linux/nfs_xdr.h                |    3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 09b3410..76ef329 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2950,7 +2950,7 @@ static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
 {
 	struct inode *inode = data->inode;
 	struct nfs_server *server = NFS_SERVER(inode);
-	
+
 #if defined(CONFIG_NFS_V4_1)
 	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
 #endif
@@ -2982,7 +2982,7 @@ static int nfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data)
 {
 	struct inode *inode = data->inode;
 	struct nfs_server *server = NFS_SERVER(inode);
-	
+
 #if defined(CONFIG_NFS_V4_1)
 	nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
 #endif
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 60a416b..bf9cdae 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -620,6 +620,8 @@ nfsd4_probe_callback(struct nfs4_client *clp)
 
 	if (IS_ERR(t))
 		atomic_dec(&clp->cl_count);
+
+	return;
 }
 
 #if defined(CONFIG_NFSD_V4_1)
diff --git a/include/linux/nfs41_session_recovery.h b/include/linux/nfs41_session_recovery.h
index 0d1d9e9..2d6322c 100644
--- a/include/linux/nfs41_session_recovery.h
+++ b/include/linux/nfs41_session_recovery.h
@@ -43,4 +43,3 @@ int nfs41_new_session(struct nfs_server *);
 
 #endif	/* CONFIG_NFS_V4_1 */
 #endif	/* __NFS41_SESSION_RECOVERY_H__ */
-
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 18de9a1..f791034 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -72,7 +72,7 @@ struct nfs_client {
 	char			cl_ipaddr[48];
 	unsigned char		cl_id_uniquifier;
 	u32			cl_minorversion;
-#endif
+#endif /* CONFIG_NFS_V4 */
 
 #ifdef CONFIG_NFS_V4_1
 	/* The sequence id to use for the next CREATE_SESSION */
@@ -80,7 +80,7 @@ struct nfs_client {
 	/* The flags used for obtaining the clientid during EXCHANGE_ID */
 	u32			cl_exchange_flags;
 	struct rpc_cred		*cl_ex_cred;	/* exchange_id credential */
-#endif
+#endif /* CONFIG_NFS_V4_1 */
 };
 
 /*
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 5eed1e6..0c461aa 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -179,7 +179,7 @@ struct nfs_openargs {
 		int		delegation_type;	/* CLAIM_PREVIOUS */
 	} u;
 	const struct qstr *	name;
-	struct nfs_server *server;	 /* Needed for ID mapping */
+	struct nfs_server *	server;	 /* Needed for ID mapping */
 	const u32 *		bitmask;
 	__u32			claim;
 #if defined(CONFIG_NFS_V4_1)
@@ -495,7 +495,6 @@ struct nfs_setattrres {
 #endif
 };
 
-
 struct nfs_linkargs {
 	struct nfs_fh *		fromfh;
 	struct nfs_fh *		tofh;
-- 
1.5.3.3