[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.	2006/12/08 02:08:46

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

Log message:
Use pnfs_hash_layoutget in pnfs_alloc_init_layout()

Index: fs/nfsd/nfs4state.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4state.c,v
retrieving revision 1.23
diff -u -p -r1.23 nfs4state.c
--- fs/nfsd/nfs4state.c	8 Dec 2006 07:07:43 -0000	1.23
+++ fs/nfsd/nfs4state.c	8 Dec 2006 07:08:07 -0000
@@ -3444,6 +3444,18 @@ get_nfs4_layout(struct nfs4_layout *lp)
atomic_read(&lp->lo_file->fi_ref.refcount));
}

+static void
+pnfs_hash_layoutget(struct nfs4_layout *lp)
+{
+	list_add(&lp->lo_perfile, &lp->lo_file->fi_layouts);
+	list_add(&lp->lo_perclnt, &lp->lo_client->cl_layouts);
+}
+
+static void
+pnfs_hash_cb_layout(struct nfs4_layout *lp)
+{
+	list_add(&lp->lo_recall_lru, &layout_recall_lru);
+}

static struct nfs4_layout *
pnfs_alloc_init_layout(struct nfs4_file *fp, struct nfs4_client *clp, struct svc_fh *current_fh, struct nfsd4_pnfs_layoutget *lg)
@@ -3476,25 +3488,12 @@ pnfs_alloc_init_layout(struct nfs4_file
lp->lo_offset = lg->lg_offset;
lp->lo_length = lg->lg_length;
num_layouts++;
-	list_add(&lp->lo_perfile, &fp->fi_layouts);
-	list_add(&lp->lo_perclnt, &clp->cl_layouts);
+	pnfs_hash_layoutget(lp);
get_nfs4_file(lp->lo_file);
dprintk("NFSD alloc_init_layout exit\n");
return lp;
}

-static void
-pnfs_hash_layoutget(struct nfs4_layout *lp)
-{
-	list_add(&lp->lo_perfile, &lp->lo_file->fi_layouts);
-	list_add(&lp->lo_perclnt, &lp->lo_client->cl_layouts);
-}
-
-static void
-pnfs_hash_cb_layout(struct nfs4_layout *lp)
-{
-	list_add(&lp->lo_recall_lru, &layout_recall_lru);
-}
/*
* get_state() and cb_get_state() are
*/