From: Fred Isaman Date: Wed, 23 Mar 2011 13:27:49 +0000 (+0000) Subject: NFSv4.1: shift filelayout_free_lseg X-Git-Tag: MMI-PSA29.97-13-9~20124^2^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c879513e91c9e38957f0d9647d22469f1887e4da;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git NFSv4.1: shift filelayout_free_lseg Move it up to avoid forward declaration in later patch. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 428558464817..9401afd5650e 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -496,6 +496,16 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, return 0; } +static void +filelayout_free_lseg(struct pnfs_layout_segment *lseg) +{ + struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); + + dprintk("--> %s\n", __func__); + nfs4_fl_put_deviceid(fl->dsaddr); + _filelayout_free_lseg(fl); +} + static struct pnfs_layout_segment * filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, struct nfs4_layoutget_res *lgr) @@ -517,16 +527,6 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, return &fl->generic_hdr; } -static void -filelayout_free_lseg(struct pnfs_layout_segment *lseg) -{ - struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); - - dprintk("--> %s\n", __func__); - nfs4_fl_put_deviceid(fl->dsaddr); - _filelayout_free_lseg(fl); -} - /* * filelayout_pg_test(). Called by nfs_can_coalesce_requests() *