libxfs: update to match 3.19-rc1 kernel code

[thirdparty/xfsprogs-dev.git] / libxfs / xfs_dir2_node.c

diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index 3dc3d4c9234f597405ebf8d1e7b9255ac1d01114..cdd06dc8aef176cdc50c26c99e92bcdf234e7d0a 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -280,7 +280,6 @@ xfs_dir2_leaf_to_node(
        int                     i;              /* leaf freespace index */
        xfs_dir2_leaf_t         *leaf;          /* leaf structure */
        xfs_dir2_leaf_tail_t    *ltp;           /* leaf tail structure */
-       xfs_mount_t             *mp;            /* filesystem mount point */
        int                     n;              /* count of live freespc ents */
        xfs_dir2_data_off_t     off;            /* freespace entry value */
        __be16                  *to;            /* pointer to freespace entry */
@@ -290,7 +289,6 @@ xfs_dir2_leaf_to_node(
        trace_xfs_dir2_leaf_to_node(args);
 
        dp = args->dp;
-       mp = dp->i_mount;
        tp = args->trans;
        /*
         * Add a freespace block to the directory.
@@ -370,16 +368,12 @@ xfs_dir2_leafn_add(
        int                     lfloghigh;      /* high leaf entry logging */
        int                     lfloglow;       /* low leaf entry logging */
        int                     lowstale;       /* previous stale entry */
-       xfs_mount_t             *mp;            /* filesystem mount point */
-       xfs_trans_t             *tp;            /* transaction pointer */
        struct xfs_dir3_icleaf_hdr leafhdr;
        struct xfs_dir2_leaf_entry *ents;
 
        trace_xfs_dir2_leafn_add(args, index);
 
        dp = args->dp;
-       mp = dp->i_mount;
-       tp = args->trans;
        leaf = bp->b_addr;
        dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf);
        ents = dp->d_ops->leaf_ents_p(leaf);
@@ -1153,7 +1147,6 @@ xfs_dir2_leafn_remove(
        xfs_dir2_leaf_entry_t   *lep;           /* leaf entry */
        int                     longest;        /* longest data free entry */
        int                     off;            /* data block entry offset */
-       xfs_mount_t             *mp;            /* filesystem mount point */
        int                     needlog;        /* need to log data header */
        int                     needscan;       /* need to rescan data frees */
        xfs_trans_t             *tp;            /* transaction pointer */
@@ -1165,7 +1158,6 @@ xfs_dir2_leafn_remove(
 
        dp = args->dp;
        tp = args->trans;
-       mp = dp->i_mount;
        leaf = bp->b_addr;
        dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf);
        ents = dp->d_ops->leaf_ents_p(leaf);
@@ -1306,7 +1298,6 @@ xfs_dir2_leafn_split(
        xfs_da_args_t           *args;          /* operation arguments */
        xfs_dablk_t             blkno;          /* new leaf block number */
        int                     error;          /* error return value */
-       xfs_mount_t             *mp;            /* filesystem mount point */
        struct xfs_inode        *dp;
 
        /*
@@ -1314,7 +1305,6 @@ xfs_dir2_leafn_split(
         */
        args = state->args;
        dp = args->dp;
-       mp = dp->i_mount;
        ASSERT(oldblk->magic == XFS_DIR2_LEAFN_MAGIC);
        error = xfs_da_grow_inode(args, &blkno);
        if (error) {
@@ -2214,12 +2204,10 @@ xfs_dir2_node_trim_free(
        xfs_inode_t             *dp;            /* incore directory inode */
        int                     error;          /* error return code */
        xfs_dir2_free_t         *free;          /* freespace structure */
-       xfs_mount_t             *mp;            /* filesystem mount point */
        xfs_trans_t             *tp;            /* transaction pointer */
        struct xfs_dir3_icfree_hdr freehdr;
 
        dp = args->dp;
-       mp = dp->i_mount;
        tp = args->trans;
        /*
         * Read the freespace block.