pNFS/flexfiles: Simplify allocation of the mirror array

Just allocate the array at the end of the layout segment structure,
instead of allocating it as a separate array of pointers.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index e7d8ae4d0cc5667f1ea35c6e7d137e52909d4e28..19728206e9c6c4e67ca93bf879432a69b7ca73cd 100644 (file)
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -248,18 +248,10 @@ static void ff_layout_put_mirror(struct nfs4_ff_layout_mirror *mirror)
 
 static void ff_layout_free_mirror_array(struct nfs4_ff_layout_segment *fls)
 {
-       int i;
+       u32 i;
 
-       if (fls->mirror_array) {
-               for (i = 0; i < fls->mirror_array_cnt; i++) {
-                       /* normally mirror_ds is freed in
-                        * .free_deviceid_node but we still do it here
-                        * for .alloc_lseg error path */
-                       ff_layout_put_mirror(fls->mirror_array[i]);
-               }
-               kfree(fls->mirror_array);
-               fls->mirror_array = NULL;
-       }
+       for (i = 0; i < fls->mirror_array_cnt; i++)
+               ff_layout_put_mirror(fls->mirror_array[i]);
 }
 
 static int ff_layout_check_layout(struct nfs4_layoutget_res *lgr)
@@ -400,16 +392,13 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh,
                goto out_err_free;
 
        rc = -ENOMEM;
-       fls = kzalloc(sizeof(*fls), gfp_flags);
+       fls = kzalloc(struct_size(fls, mirror_array, mirror_array_cnt),
+                       gfp_flags);
        if (!fls)
                goto out_err_free;
 
        fls->mirror_array_cnt = mirror_array_cnt;
        fls->stripe_unit = stripe_unit;
-       fls->mirror_array = kcalloc(fls->mirror_array_cnt,
-                                   sizeof(fls->mirror_array[0]), gfp_flags);
-       if (fls->mirror_array == NULL)
-               goto out_err_free;
 
        for (i = 0; i < fls->mirror_array_cnt; i++) {
                struct nfs4_ff_layout_mirror *mirror;

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h
index 2f369966abf7179c625f5d046e52cbfa1fc80eb0..354a031c69b17204b5be9db6d2e0fab682225adb 100644 (file)
--- a/fs/nfs/flexfilelayout/flexfilelayout.h
+++ b/fs/nfs/flexfilelayout/flexfilelayout.h
@@ -99,7 +99,7 @@ struct nfs4_ff_layout_segment {
        u64                             stripe_unit;
        u32                             flags;
        u32                             mirror_array_cnt;
-       struct nfs4_ff_layout_mirror    **mirror_array;
+       struct nfs4_ff_layout_mirror    *mirror_array[];
 };
 
 struct nfs4_flexfile_layout {