xfs: split xfs_imap_to_bp

Source kernel commit: af9dcddef662e1437a63c2decb6e1e2efb7d81ea

Split looking up the dinode from xfs_imap_to_bp, which can be
significantly simplified as a result.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index fd456d6b4678264f932953ca2961cf0a6c8a06f6..713ef9afc8c61df90f936659fdf716462304cfe2 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1060,7 +1060,6 @@ libxfs_iget(
        struct xfs_inode        **ipp)
 {
        struct xfs_inode        *ip;
-       struct xfs_dinode       *dip;
        struct xfs_buf          *bp;
        int                     error = 0;
 
@@ -1075,11 +1074,12 @@ libxfs_iget(
        if (error)
                goto out_destroy;
 
-       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0);
+       error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &bp);
        if (error)
                goto out_destroy;
 
-       error = xfs_inode_from_disk(ip, dip);
+       error = xfs_inode_from_disk(ip,
+                       xfs_buf_offset(bp, ip->i_imap.im_boffset));
        if (!error)
                xfs_buf_set_ref(bp, XFS_INO_REF);
        xfs_trans_brelse(tp, bp);

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index c9bde7ee3ebc94c5bce23ab09cd7f23741df993d..babab3f96c1899fd0fd0112887c6f6653aaf3488 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -121,37 +121,18 @@ const struct xfs_buf_ops xfs_inode_buf_ra_ops = {
 /*
  * This routine is called to map an inode to the buffer containing the on-disk
  * version of the inode.  It returns a pointer to the buffer containing the
- * on-disk inode in the bpp parameter, and in the dipp parameter it returns a
- * pointer to the on-disk inode within that buffer.
- *
- * If a non-zero error is returned, then the contents of bpp and dipp are
- * undefined.
+ * on-disk inode in the bpp parameter.
  */
 int
 xfs_imap_to_bp(
        struct xfs_mount        *mp,
        struct xfs_trans        *tp,
        struct xfs_imap         *imap,
-       struct xfs_dinode       **dipp,
-       struct xfs_buf          **bpp,
-       uint                    buf_flags)
+       struct xfs_buf          **bpp)
 {
-       struct xfs_buf          *bp;
-       int                     error;
-
-       buf_flags |= XBF_UNMAPPED;
-       error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap->im_blkno,
-                                  (int)imap->im_len, buf_flags, &bp,
+       return xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap->im_blkno,
+                                  imap->im_len, XBF_UNMAPPED, bpp,
                                   &xfs_inode_buf_ops);
-       if (error) {
-               ASSERT(error != -EAGAIN || (buf_flags & XBF_TRYLOCK));
-               return error;
-       }
-
-       *bpp = bp;
-       if (dipp)
-               *dipp = xfs_buf_offset(bp, imap->im_boffset);
-       return 0;
 }
 
 static inline struct timespec64 xfs_inode_decode_bigtime(uint64_t ts)

diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
index ef5eaf33d146ffaa459b8255ce379f159fe0e3ba..9e1ae38380b3c0ebcf1f4bcc4ae4b81a6c685c40 100644 (file)
--- a/libxfs/xfs_inode_buf.h
+++ b/libxfs/xfs_inode_buf.h
@@ -47,9 +47,8 @@ struct xfs_imap {
        unsigned short  im_boffset;     /* inode offset in block in bytes */
 };
 
-int    xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,
-                      struct xfs_imap *, struct xfs_dinode **,
-                      struct xfs_buf **, uint);
+int    xfs_imap_to_bp(struct xfs_mount *mp, struct xfs_trans *tp,
+                      struct xfs_imap *imap, struct xfs_buf **bpp);
 void   xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);
 void   xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,
                          xfs_lsn_t lsn);

diff --git a/libxfs/xfs_trans_inode.c b/libxfs/xfs_trans_inode.c
index 66dadd8716eef94d993c46963b301f8df0cc76d3..9dc59c3b5afba972a80d6d5107788add16a886f1 100644 (file)
--- a/libxfs/xfs_trans_inode.c
+++ b/libxfs/xfs_trans_inode.c
@@ -161,8 +161,7 @@ xfs_trans_log_inode(
                 * here.
                 */
                spin_unlock(&iip->ili_lock);
-               error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, NULL,
-                                       &bp, 0);
+               error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, &bp);
                if (error) {
                        xfs_force_shutdown(ip->i_mount, SHUTDOWN_META_IO_ERROR);
                        return;