diff options
author | Fred Isaman <iisaman@netapp.com> | 2011-03-23 09:27:49 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-23 15:29:03 -0400 |
commit | c879513e91c9e38957f0d9647d22469f1887e4da (patch) | |
tree | d15cec7abd2a6c56559e261203b3e1de256c9283 | |
parent | 5917ce8440ba0b3f2adee613b5f1258ac5efff02 (diff) |
NFSv4.1: shift filelayout_free_lseg
Move it up to avoid forward declaration in later patch.
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 20 |
1 files changed, 10 insertions, 10 deletions
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, | |||
496 | return 0; | 496 | return 0; |
497 | } | 497 | } |
498 | 498 | ||
499 | static void | ||
500 | filelayout_free_lseg(struct pnfs_layout_segment *lseg) | ||
501 | { | ||
502 | struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); | ||
503 | |||
504 | dprintk("--> %s\n", __func__); | ||
505 | nfs4_fl_put_deviceid(fl->dsaddr); | ||
506 | _filelayout_free_lseg(fl); | ||
507 | } | ||
508 | |||
499 | static struct pnfs_layout_segment * | 509 | static struct pnfs_layout_segment * |
500 | filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, | 510 | filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, |
501 | struct nfs4_layoutget_res *lgr) | 511 | struct nfs4_layoutget_res *lgr) |
@@ -517,16 +527,6 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, | |||
517 | return &fl->generic_hdr; | 527 | return &fl->generic_hdr; |
518 | } | 528 | } |
519 | 529 | ||
520 | static void | ||
521 | filelayout_free_lseg(struct pnfs_layout_segment *lseg) | ||
522 | { | ||
523 | struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); | ||
524 | |||
525 | dprintk("--> %s\n", __func__); | ||
526 | nfs4_fl_put_deviceid(fl->dsaddr); | ||
527 | _filelayout_free_lseg(fl); | ||
528 | } | ||
529 | |||
530 | /* | 530 | /* |
531 | * filelayout_pg_test(). Called by nfs_can_coalesce_requests() | 531 | * filelayout_pg_test(). Called by nfs_can_coalesce_requests() |
532 | * | 532 | * |