[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.umich.edu	2007/02/01 21:37:18

Modified files:
	cvs/pnfs/fs/nfsd: nfs4state.c 

Log message:
Fix compiler warnings and cosmetic changes in fs/nfsd/nfs4state.c

Index: fs/nfsd/nfs4state.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4state.c,v
retrieving revision 1.36
diff -d -u -p -r1.36 nfs4state.c
--- fs/nfsd/nfs4state.c	2 Feb 2007 02:17:22 -0000	1.36
+++ fs/nfsd/nfs4state.c	2 Feb 2007 02:35:19 -0000
@@ -400,7 +400,7 @@ struct sessionid_hashtbl_element *find_i
int idx;
int found = 0;

-        dump_sessionid(__FUNCTION__, sessionid);
+        dump_sessionid((char *)__FUNCTION__, sessionid);
idx = hash_sessionid(sessionid);
dprintk("%s: idx is %d\n", __FUNCTION__, idx);
/* Search in the appropriate list */
@@ -413,7 +413,7 @@ struct sessionid_hashtbl_element *find_i
}

/* Check if we found the element */
-        dprintk("%s: found %d elem %d\n", __FUNCTION__, found, elem);
+        dprintk("%s: found %d elem %p\n", __FUNCTION__, found, elem);
if (!found)
return NULL;

@@ -453,7 +453,7 @@ STALE_CLIENTID(clientid_t *clid)
{
if (clid->cl_boot == boot_time)
return 0;
-	dprintk("xxx ignore NFSD stale clientid (%08x/%08x) boot_time %08x\n",
+	dprintk("xxx ignore NFSD stale clientid (%08x/%08x) boot_time %08lx\n",
clid->cl_boot, clid->cl_id, boot_time);
return 0; //??? temp fix
return 1;
@@ -750,7 +750,7 @@ find_unconfirmed_client_by_str(const cha
}

static struct nfs4_client *
-find_any_client()
+find_any_client(void)
{
int i;
struct nfs4_client *clp = NULL;
@@ -1320,15 +1320,16 @@ int nfsd4_create_session(struct svc_rqst
nfsd4_probe_callback(unconf);
conf = unconf;
}
-		add_to_sessionid_hashtbl(&conf->cl_clientid, &conf->cl_sessionid);
+	add_to_sessionid_hashtbl(&conf->cl_clientid, &conf->cl_sessionid);

out_replay:
-                memcpy(session->sessionid, conf->cl_sessionid, 16);
-                session->seqid = conf->cl_seqid;
+	memcpy(session->sessionid, conf->cl_sessionid, 16);
+	session->seqid = conf->cl_seqid;
out:
-                nfs4_unlock_state();
-                dprintk("%s returns %d %d\n", __FUNCTION__, status, ntohl(status));
-                return status;
+	nfs4_unlock_state();
+	dprintk("%s returns %d %d\n", __FUNCTION__, status, ntohl(status));
+	return status;
+
hack:
gen_ds_sessionid(&session->clientid, &session->sessionid);
session->seqid = 1; /* unused */
@@ -2248,7 +2249,7 @@ nfsd4_sequence(struct svc_rqst *r, sessi

if (!elem) {
printk(KERN_EMERG "stale clientid supplied to sequence!!\n");
-                dump_sessionid(__FUNCTION__, &seq->sessionid);
+                dump_sessionid((char *)__FUNCTION__, &seq->sessionid);
return nfserr_stale_clientid;
}