]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - fs/xfs/xfs_bmap.c
[PATCH] autofs4: change AUTOFS_TYP_* AUTOFS_TYPE_*
[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_bmap.c
index 53c47a181f87537ee0480be94e46911bdf0b99f3..2d702e4a74a359235cc622c08d8ff64477d7a60c 100644 (file)
@@ -2294,25 +2294,15 @@ xfs_bmap_extsize_align(
 
 #define XFS_ALLOC_GAP_UNITS    4
 
-/*
- * xfs_bmap_alloc is called by xfs_bmapi to allocate an extent for a file.
- * It figures out where to ask the underlying allocator to put the new extent.
- */
 STATIC int
-xfs_bmap_alloc(
+xfs_bmap_adjacent(
        xfs_bmalloca_t  *ap)            /* bmap alloc argument struct */
 {
        xfs_fsblock_t   adjust;         /* adjustment to block numbers */
-       xfs_alloctype_t atype=0;        /* type for allocation routines */
-       int             error;          /* error return value */
        xfs_agnumber_t  fb_agno;        /* ag number of ap->firstblock */
        xfs_mount_t     *mp;            /* mount point structure */
        int             nullfb;         /* true if ap->firstblock isn't set */
        int             rt;             /* true if inode is realtime */
-       xfs_extlen_t    prod = 0;       /* product factor for allocators */
-       xfs_extlen_t    ralen = 0;      /* realtime allocation length */
-       xfs_extlen_t    align;          /* minimum allocation alignment */
-       xfs_rtblock_t   rtx;
 
 #define        ISVALID(x,y)    \
        (rt ? \
@@ -2321,75 +2311,10 @@ xfs_bmap_alloc(
                XFS_FSB_TO_AGNO(mp, x) < mp->m_sb.sb_agcount && \
                XFS_FSB_TO_AGBNO(mp, x) < mp->m_sb.sb_agblocks)
 
-       /*
-        * Set up variables.
-        */
        mp = ap->ip->i_mount;
        nullfb = ap->firstblock == NULLFSBLOCK;
        rt = XFS_IS_REALTIME_INODE(ap->ip) && ap->userdata;
        fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp, ap->firstblock);
-       if (rt) {
-               align = ap->ip->i_d.di_extsize ?
-                       ap->ip->i_d.di_extsize : mp->m_sb.sb_rextsize;
-               /* Set prod to match the extent size */
-               prod = align / mp->m_sb.sb_rextsize;
-
-               error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,
-                                               align, rt, ap->eof, 0,
-                                               ap->conv, &ap->off, &ap->alen);
-               if (error)
-                       return error;
-               ASSERT(ap->alen);
-               ASSERT(ap->alen % mp->m_sb.sb_rextsize == 0);
-
-               /*
-                * If the offset & length are not perfectly aligned
-                * then kill prod, it will just get us in trouble.
-                */
-               if (do_mod(ap->off, align) || ap->alen % align)
-                       prod = 1;
-               /*
-                * Set ralen to be the actual requested length in rtextents.
-                */
-               ralen = ap->alen / mp->m_sb.sb_rextsize;
-               /*
-                * If the old value was close enough to MAXEXTLEN that
-                * we rounded up to it, cut it back so it's valid again.
-                * Note that if it's a really large request (bigger than
-                * MAXEXTLEN), we don't hear about that number, and can't
-                * adjust the starting point to match it.
-                */
-               if (ralen * mp->m_sb.sb_rextsize >= MAXEXTLEN)
-                       ralen = MAXEXTLEN / mp->m_sb.sb_rextsize;
-               /*
-                * If it's an allocation to an empty file at offset 0,
-                * pick an extent that will space things out in the rt area.
-                */
-               if (ap->eof && ap->off == 0) {
-                       error = xfs_rtpick_extent(mp, ap->tp, ralen, &rtx);
-                       if (error)
-                               return error;
-                       ap->rval = rtx * mp->m_sb.sb_rextsize;
-               } else
-                       ap->rval = 0;
-       } else {
-               align = (ap->userdata && ap->ip->i_d.di_extsize &&
-                       (ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE)) ?
-                       ap->ip->i_d.di_extsize : 0;
-               if (unlikely(align)) {
-                       error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,
-                                                       align, rt,
-                                                       ap->eof, 0, ap->conv,
-                                                       &ap->off, &ap->alen);
-                       ASSERT(!error);
-                       ASSERT(ap->alen);
-               }
-               if (nullfb)
-                       ap->rval = XFS_INO_TO_FSB(mp, ap->ip->i_ino);
-               else
-                       ap->rval = ap->firstblock;
-       }
-
        /*
         * If allocating at eof, and there's a previous real block,
         * try to use it's last block as our starting point.
@@ -2514,281 +2439,378 @@ xfs_bmap_alloc(
                else if (gotbno != NULLFSBLOCK)
                        ap->rval = gotbno;
        }
+#undef ISVALID
+       return 0;
+}
+
+STATIC int
+xfs_bmap_rtalloc(
+       xfs_bmalloca_t  *ap)            /* bmap alloc argument struct */
+{
+       xfs_alloctype_t atype = 0;      /* type for allocation routines */
+       int             error;          /* error return value */
+       xfs_mount_t     *mp;            /* mount point structure */
+       xfs_extlen_t    prod = 0;       /* product factor for allocators */
+       xfs_extlen_t    ralen = 0;      /* realtime allocation length */
+       xfs_extlen_t    align;          /* minimum allocation alignment */
+       xfs_rtblock_t   rtx;            /* realtime extent number */
+       xfs_rtblock_t   rtb;
+
+       mp = ap->ip->i_mount;
+       align = ap->ip->i_d.di_extsize ?
+               ap->ip->i_d.di_extsize : mp->m_sb.sb_rextsize;
+       prod = align / mp->m_sb.sb_rextsize;
+       error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,
+                                       align, 1, ap->eof, 0,
+                                       ap->conv, &ap->off, &ap->alen);
+       if (error)
+               return error;
+       ASSERT(ap->alen);
+       ASSERT(ap->alen % mp->m_sb.sb_rextsize == 0);
+
+       /*
+        * If the offset & length are not perfectly aligned
+        * then kill prod, it will just get us in trouble.
+        */
+       if (do_mod(ap->off, align) || ap->alen % align)
+               prod = 1;
+       /*
+        * Set ralen to be the actual requested length in rtextents.
+        */
+       ralen = ap->alen / mp->m_sb.sb_rextsize;
+       /*
+        * If the old value was close enough to MAXEXTLEN that
+        * we rounded up to it, cut it back so it's valid again.
+        * Note that if it's a really large request (bigger than
+        * MAXEXTLEN), we don't hear about that number, and can't
+        * adjust the starting point to match it.
+        */
+       if (ralen * mp->m_sb.sb_rextsize >= MAXEXTLEN)
+               ralen = MAXEXTLEN / mp->m_sb.sb_rextsize;
+       /*
+        * If it's an allocation to an empty file at offset 0,
+        * pick an extent that will space things out in the rt area.
+        */
+       if (ap->eof && ap->off == 0) {
+               error = xfs_rtpick_extent(mp, ap->tp, ralen, &rtx);
+               if (error)
+                       return error;
+               ap->rval = rtx * mp->m_sb.sb_rextsize;
+       } else {
+               ap->rval = 0;
+       }
+
+       xfs_bmap_adjacent(ap);
+
+       /*
+        * Realtime allocation, done through xfs_rtallocate_extent.
+        */
+       atype = ap->rval == 0 ?  XFS_ALLOCTYPE_ANY_AG : XFS_ALLOCTYPE_NEAR_BNO;
+       do_div(ap->rval, mp->m_sb.sb_rextsize);
+       rtb = ap->rval;
+       ap->alen = ralen;
+       if ((error = xfs_rtallocate_extent(ap->tp, ap->rval, 1, ap->alen,
+                               &ralen, atype, ap->wasdel, prod, &rtb)))
+               return error;
+       if (rtb == NULLFSBLOCK && prod > 1 &&
+           (error = xfs_rtallocate_extent(ap->tp, ap->rval, 1,
+                                          ap->alen, &ralen, atype,
+                                          ap->wasdel, 1, &rtb)))
+               return error;
+       ap->rval = rtb;
+       if (ap->rval != NULLFSBLOCK) {
+               ap->rval *= mp->m_sb.sb_rextsize;
+               ralen *= mp->m_sb.sb_rextsize;
+               ap->alen = ralen;
+               ap->ip->i_d.di_nblocks += ralen;
+               xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
+               if (ap->wasdel)
+                       ap->ip->i_delayed_blks -= ralen;
+               /*
+                * Adjust the disk quota also. This was reserved
+                * earlier.
+                */
+               XFS_TRANS_MOD_DQUOT_BYINO(mp, ap->tp, ap->ip,
+                       ap->wasdel ? XFS_TRANS_DQ_DELRTBCOUNT :
+                                       XFS_TRANS_DQ_RTBCOUNT, (long) ralen);
+       } else {
+               ap->alen = 0;
+       }
+       return 0;
+}
+
+STATIC int
+xfs_bmap_btalloc(
+       xfs_bmalloca_t  *ap)            /* bmap alloc argument struct */
+{
+       xfs_mount_t     *mp;            /* mount point structure */
+       xfs_alloctype_t atype = 0;      /* type for allocation routines */
+       xfs_extlen_t    align;          /* minimum allocation alignment */
+       xfs_agnumber_t  ag;
+       xfs_agnumber_t  fb_agno;        /* ag number of ap->firstblock */
+       xfs_agnumber_t  startag;
+       xfs_alloc_arg_t args;
+       xfs_extlen_t    blen;
+       xfs_extlen_t    delta;
+       xfs_extlen_t    longest;
+       xfs_extlen_t    need;
+       xfs_extlen_t    nextminlen = 0;
+       xfs_perag_t     *pag;
+       int             nullfb;         /* true if ap->firstblock isn't set */
+       int             isaligned;
+       int             notinit;
+       int             tryagain;
+       int             error;
+
+       mp = ap->ip->i_mount;
+       align = (ap->userdata && ap->ip->i_d.di_extsize &&
+               (ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE)) ?
+               ap->ip->i_d.di_extsize : 0;
+       if (unlikely(align)) {
+               error = xfs_bmap_extsize_align(mp, ap->gotp, ap->prevp,
+                                               align, 0, ap->eof, 0, ap->conv,
+                                               &ap->off, &ap->alen);
+               ASSERT(!error);
+               ASSERT(ap->alen);
+       }
+       nullfb = ap->firstblock == NULLFSBLOCK;
+       fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp, ap->firstblock);
+       if (nullfb)
+               ap->rval = XFS_INO_TO_FSB(mp, ap->ip->i_ino);
+       else
+               ap->rval = ap->firstblock;
+
+       xfs_bmap_adjacent(ap);
+
        /*
         * If allowed, use ap->rval; otherwise must use firstblock since
         * it's in the right allocation group.
         */
-       if (nullfb || rt || XFS_FSB_TO_AGNO(mp, ap->rval) == fb_agno)
+       if (nullfb || XFS_FSB_TO_AGNO(mp, ap->rval) == fb_agno)
                ;
        else
                ap->rval = ap->firstblock;
        /*
-        * Realtime allocation, done through xfs_rtallocate_extent.
+        * Normal allocation, done through xfs_alloc_vextent.
         */
-       if (rt) {
-#ifndef __KERNEL__
-               ASSERT(0);
-#else
-               xfs_rtblock_t   rtb;
-
-               atype = ap->rval == 0 ?
-                       XFS_ALLOCTYPE_ANY_AG : XFS_ALLOCTYPE_NEAR_BNO;
-               do_div(ap->rval, mp->m_sb.sb_rextsize);
-               rtb = ap->rval;
-               ap->alen = ralen;
-               if ((error = xfs_rtallocate_extent(ap->tp, ap->rval, 1, ap->alen,
-                               &ralen, atype, ap->wasdel, prod, &rtb)))
-                       return error;
-               if (rtb == NULLFSBLOCK && prod > 1 &&
-                   (error = xfs_rtallocate_extent(ap->tp, ap->rval, 1,
-                                                  ap->alen, &ralen, atype,
-                                                  ap->wasdel, 1, &rtb)))
-                       return error;
-               ap->rval = rtb;
-               if (ap->rval != NULLFSBLOCK) {
-                       ap->rval *= mp->m_sb.sb_rextsize;
-                       ralen *= mp->m_sb.sb_rextsize;
-                       ap->alen = ralen;
-                       ap->ip->i_d.di_nblocks += ralen;
-                       xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
-                       if (ap->wasdel)
-                               ap->ip->i_delayed_blks -= ralen;
+       tryagain = isaligned = 0;
+       args.tp = ap->tp;
+       args.mp = mp;
+       args.fsbno = ap->rval;
+       args.maxlen = MIN(ap->alen, mp->m_sb.sb_agblocks);
+       blen = 0;
+       if (nullfb) {
+               args.type = XFS_ALLOCTYPE_START_BNO;
+               args.total = ap->total;
+               /*
+                * Find the longest available space.
+                * We're going to try for the whole allocation at once.
+                */
+               startag = ag = XFS_FSB_TO_AGNO(mp, args.fsbno);
+               notinit = 0;
+               down_read(&mp->m_peraglock);
+               while (blen < ap->alen) {
+                       pag = &mp->m_perag[ag];
+                       if (!pag->pagf_init &&
+                           (error = xfs_alloc_pagf_init(mp, args.tp,
+                                   ag, XFS_ALLOC_FLAG_TRYLOCK))) {
+                               up_read(&mp->m_peraglock);
+                               return error;
+                       }
                        /*
-                        * Adjust the disk quota also. This was reserved
-                        * earlier.
+                        * See xfs_alloc_fix_freelist...
                         */
-                       XFS_TRANS_MOD_DQUOT_BYINO(mp, ap->tp, ap->ip,
-                               ap->wasdel ? XFS_TRANS_DQ_DELRTBCOUNT :
-                                               XFS_TRANS_DQ_RTBCOUNT,
-                               (long) ralen);
-               } else
-                       ap->alen = 0;
-#endif /* __KERNEL__ */
+                       if (pag->pagf_init) {
+                               need = XFS_MIN_FREELIST_PAG(pag, mp);
+                               delta = need > pag->pagf_flcount ?
+                                       need - pag->pagf_flcount : 0;
+                               longest = (pag->pagf_longest > delta) ?
+                                       (pag->pagf_longest - delta) :
+                                       (pag->pagf_flcount > 0 ||
+                                        pag->pagf_longest > 0);
+                               if (blen < longest)
+                                       blen = longest;
+                       } else
+                               notinit = 1;
+                       if (++ag == mp->m_sb.sb_agcount)
+                               ag = 0;
+                       if (ag == startag)
+                               break;
+               }
+               up_read(&mp->m_peraglock);
+               /*
+                * Since the above loop did a BUF_TRYLOCK, it is
+                * possible that there is space for this request.
+                */
+               if (notinit || blen < ap->minlen)
+                       args.minlen = ap->minlen;
+               /*
+                * If the best seen length is less than the request
+                * length, use the best as the minimum.
+                */
+               else if (blen < ap->alen)
+                       args.minlen = blen;
+               /*
+                * Otherwise we've seen an extent as big as alen,
+                * use that as the minimum.
+                */
+               else
+                       args.minlen = ap->alen;
+       } else if (ap->low) {
+               args.type = XFS_ALLOCTYPE_FIRST_AG;
+               args.total = args.minlen = ap->minlen;
+       } else {
+               args.type = XFS_ALLOCTYPE_NEAR_BNO;
+               args.total = ap->total;
+               args.minlen = ap->minlen;
+       }
+       if (unlikely(ap->userdata && ap->ip->i_d.di_extsize &&
+                   (ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE))) {
+               args.prod = ap->ip->i_d.di_extsize;
+               if ((args.mod = (xfs_extlen_t)do_mod(ap->off, args.prod)))
+                       args.mod = (xfs_extlen_t)(args.prod - args.mod);
+       } else if (unlikely(mp->m_sb.sb_blocksize >= NBPP)) {
+               args.prod = 1;
+               args.mod = 0;
+       } else {
+               args.prod = NBPP >> mp->m_sb.sb_blocklog;
+               if ((args.mod = (xfs_extlen_t)(do_mod(ap->off, args.prod))))
+                       args.mod = (xfs_extlen_t)(args.prod - args.mod);
        }
        /*
-        * Normal allocation, done through xfs_alloc_vextent.
+        * If we are not low on available data blocks, and the
+        * underlying logical volume manager is a stripe, and
+        * the file offset is zero then try to allocate data
+        * blocks on stripe unit boundary.
+        * NOTE: ap->aeof is only set if the allocation length
+        * is >= the stripe unit and the allocation offset is
+        * at the end of file.
         */
-       else {
-               xfs_agnumber_t  ag;
-               xfs_alloc_arg_t args;
-               xfs_extlen_t    blen;
-               xfs_extlen_t    delta;
-               int             isaligned;
-               xfs_extlen_t    longest;
-               xfs_extlen_t    need;
-               xfs_extlen_t    nextminlen=0;
-               int             notinit;
-               xfs_perag_t     *pag;
-               xfs_agnumber_t  startag;
-               int             tryagain;
-
-               tryagain = isaligned = 0;
-               args.tp = ap->tp;
-               args.mp = mp;
-               args.fsbno = ap->rval;
-               args.maxlen = MIN(ap->alen, mp->m_sb.sb_agblocks);
-               blen = 0;
-               if (nullfb) {
-                       args.type = XFS_ALLOCTYPE_START_BNO;
-                       args.total = ap->total;
-                       /*
-                        * Find the longest available space.
-                        * We're going to try for the whole allocation at once.
-                        */
-                       startag = ag = XFS_FSB_TO_AGNO(mp, args.fsbno);
-                       notinit = 0;
-                       down_read(&mp->m_peraglock);
-                       while (blen < ap->alen) {
-                               pag = &mp->m_perag[ag];
-                               if (!pag->pagf_init &&
-                                   (error = xfs_alloc_pagf_init(mp, args.tp,
-                                           ag, XFS_ALLOC_FLAG_TRYLOCK))) {
-                                       up_read(&mp->m_peraglock);
-                                       return error;
-                               }
-                               /*
-                                * See xfs_alloc_fix_freelist...
-                                */
-                               if (pag->pagf_init) {
-                                       need = XFS_MIN_FREELIST_PAG(pag, mp);
-                                       delta = need > pag->pagf_flcount ?
-                                               need - pag->pagf_flcount : 0;
-                                       longest = (pag->pagf_longest > delta) ?
-                                               (pag->pagf_longest - delta) :
-                                               (pag->pagf_flcount > 0 ||
-                                                pag->pagf_longest > 0);
-                                       if (blen < longest)
-                                               blen = longest;
-                               } else
-                                       notinit = 1;
-                               if (++ag == mp->m_sb.sb_agcount)
-                                       ag = 0;
-                               if (ag == startag)
-                                       break;
-                       }
-                       up_read(&mp->m_peraglock);
+       if (!ap->low && ap->aeof) {
+               if (!ap->off) {
+                       args.alignment = mp->m_dalign;
+                       atype = args.type;
+                       isaligned = 1;
                        /*
-                        * Since the above loop did a BUF_TRYLOCK, it is
-                        * possible that there is space for this request.
+                        * Adjust for alignment
                         */
-                       if (notinit || blen < ap->minlen)
-                               args.minlen = ap->minlen;
+                       if (blen > args.alignment && blen <= ap->alen)
+                               args.minlen = blen - args.alignment;
+                       args.minalignslop = 0;
+               } else {
                        /*
-                        * If the best seen length is less than the request
-                        * length, use the best as the minimum.
+                        * First try an exact bno allocation.
+                        * If it fails then do a near or start bno
+                        * allocation with alignment turned on.
                         */
-                       else if (blen < ap->alen)
-                               args.minlen = blen;
+                       atype = args.type;
+                       tryagain = 1;
+                       args.type = XFS_ALLOCTYPE_THIS_BNO;
+                       args.alignment = 1;
                        /*
-                        * Otherwise we've seen an extent as big as alen,
-                        * use that as the minimum.
+                        * Compute the minlen+alignment for the
+                        * next case.  Set slop so that the value
+                        * of minlen+alignment+slop doesn't go up
+                        * between the calls.
                         */
+                       if (blen > mp->m_dalign && blen <= ap->alen)
+                               nextminlen = blen - mp->m_dalign;
                        else
-                               args.minlen = ap->alen;
-               } else if (ap->low) {
-                       args.type = XFS_ALLOCTYPE_FIRST_AG;
-                       args.total = args.minlen = ap->minlen;
-               } else {
-                       args.type = XFS_ALLOCTYPE_NEAR_BNO;
-                       args.total = ap->total;
-                       args.minlen = ap->minlen;
-               }
-               if (unlikely(ap->userdata && ap->ip->i_d.di_extsize &&
-                           (ap->ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE))) {
-                       args.prod = ap->ip->i_d.di_extsize;
-                       if ((args.mod = (xfs_extlen_t)do_mod(ap->off, args.prod)))
-                               args.mod = (xfs_extlen_t)(args.prod - args.mod);
-               } else if (unlikely(mp->m_sb.sb_blocksize >= NBPP)) {
-                       args.prod = 1;
-                       args.mod = 0;
-               } else {
-                       args.prod = NBPP >> mp->m_sb.sb_blocklog;
-                       if ((args.mod = (xfs_extlen_t)(do_mod(ap->off, args.prod))))
-                               args.mod = (xfs_extlen_t)(args.prod - args.mod);
+                               nextminlen = args.minlen;
+                       if (nextminlen + mp->m_dalign > args.minlen + 1)
+                               args.minalignslop =
+                                       nextminlen + mp->m_dalign -
+                                       args.minlen - 1;
+                       else
+                               args.minalignslop = 0;
                }
+       } else {
+               args.alignment = 1;
+               args.minalignslop = 0;
+       }
+       args.minleft = ap->minleft;
+       args.wasdel = ap->wasdel;
+       args.isfl = 0;
+       args.userdata = ap->userdata;
+       if ((error = xfs_alloc_vextent(&args)))
+               return error;
+       if (tryagain && args.fsbno == NULLFSBLOCK) {
                /*
-                * If we are not low on available data blocks, and the
-                * underlying logical volume manager is a stripe, and
-                * the file offset is zero then try to allocate data
-                * blocks on stripe unit boundary.
-                * NOTE: ap->aeof is only set if the allocation length
-                * is >= the stripe unit and the allocation offset is
-                * at the end of file.
+                * Exact allocation failed. Now try with alignment
+                * turned on.
                 */
-               if (!ap->low && ap->aeof) {
-                       if (!ap->off) {
-                               args.alignment = mp->m_dalign;
-                               atype = args.type;
-                               isaligned = 1;
-                               /*
-                                * Adjust for alignment
-                                */
-                               if (blen > args.alignment && blen <= ap->alen)
-                                       args.minlen = blen - args.alignment;
-                               args.minalignslop = 0;
-                       } else {
-                               /*
-                                * First try an exact bno allocation.
-                                * If it fails then do a near or start bno
-                                * allocation with alignment turned on.
-                                */
-                               atype = args.type;
-                               tryagain = 1;
-                               args.type = XFS_ALLOCTYPE_THIS_BNO;
-                               args.alignment = 1;
-                               /*
-                                * Compute the minlen+alignment for the
-                                * next case.  Set slop so that the value
-                                * of minlen+alignment+slop doesn't go up
-                                * between the calls.
-                                */
-                               if (blen > mp->m_dalign && blen <= ap->alen)
-                                       nextminlen = blen - mp->m_dalign;
-                               else
-                                       nextminlen = args.minlen;
-                               if (nextminlen + mp->m_dalign > args.minlen + 1)
-                                       args.minalignslop =
-                                               nextminlen + mp->m_dalign -
-                                               args.minlen - 1;
-                               else
-                                       args.minalignslop = 0;
-                       }
-               } else {
-                       args.alignment = 1;
-                       args.minalignslop = 0;
-               }
-               args.minleft = ap->minleft;
-               args.wasdel = ap->wasdel;
-               args.isfl = 0;
-               args.userdata = ap->userdata;
+               args.type = atype;
+               args.fsbno = ap->rval;
+               args.alignment = mp->m_dalign;
+               args.minlen = nextminlen;
+               args.minalignslop = 0;
+               isaligned = 1;
                if ((error = xfs_alloc_vextent(&args)))
                        return error;
-               if (tryagain && args.fsbno == NULLFSBLOCK) {
-                       /*
-                        * Exact allocation failed. Now try with alignment
-                        * turned on.
-                        */
-                       args.type = atype;
-                       args.fsbno = ap->rval;
-                       args.alignment = mp->m_dalign;
-                       args.minlen = nextminlen;
-                       args.minalignslop = 0;
-                       isaligned = 1;
-                       if ((error = xfs_alloc_vextent(&args)))
-                               return error;
-               }
-               if (isaligned && args.fsbno == NULLFSBLOCK) {
-                       /*
-                        * allocation failed, so turn off alignment and
-                        * try again.
-                        */
-                       args.type = atype;
-                       args.fsbno = ap->rval;
-                       args.alignment = 0;
-                       if ((error = xfs_alloc_vextent(&args)))
-                               return error;
-               }
-               if (args.fsbno == NULLFSBLOCK && nullfb &&
-                   args.minlen > ap->minlen) {
-                       args.minlen = ap->minlen;
-                       args.type = XFS_ALLOCTYPE_START_BNO;
-                       args.fsbno = ap->rval;
-                       if ((error = xfs_alloc_vextent(&args)))
-                               return error;
-               }
-               if (args.fsbno == NULLFSBLOCK && nullfb) {
-                       args.fsbno = 0;
-                       args.type = XFS_ALLOCTYPE_FIRST_AG;
-                       args.total = ap->minlen;
-                       args.minleft = 0;
-                       if ((error = xfs_alloc_vextent(&args)))
-                               return error;
-                       ap->low = 1;
-               }
-               if (args.fsbno != NULLFSBLOCK) {
-                       ap->firstblock = ap->rval = args.fsbno;
-                       ASSERT(nullfb || fb_agno == args.agno ||
-                              (ap->low && fb_agno < args.agno));
-                       ap->alen = args.len;
-                       ap->ip->i_d.di_nblocks += args.len;
-                       xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
-                       if (ap->wasdel)
-                               ap->ip->i_delayed_blks -= args.len;
-                       /*
-                        * Adjust the disk quota also. This was reserved
-                        * earlier.
-                        */
-                       XFS_TRANS_MOD_DQUOT_BYINO(mp, ap->tp, ap->ip,
-                               ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT :
-                                               XFS_TRANS_DQ_BCOUNT,
-                               (long) args.len);
-               } else {
-                       ap->rval = NULLFSBLOCK;
-                       ap->alen = 0;
-               }
+       }
+       if (isaligned && args.fsbno == NULLFSBLOCK) {
+               /*
+                * allocation failed, so turn off alignment and
+                * try again.
+                */
+               args.type = atype;
+               args.fsbno = ap->rval;
+               args.alignment = 0;
+               if ((error = xfs_alloc_vextent(&args)))
+                       return error;
+       }
+       if (args.fsbno == NULLFSBLOCK && nullfb &&
+           args.minlen > ap->minlen) {
+               args.minlen = ap->minlen;
+               args.type = XFS_ALLOCTYPE_START_BNO;
+               args.fsbno = ap->rval;
+               if ((error = xfs_alloc_vextent(&args)))
+                       return error;
+       }
+       if (args.fsbno == NULLFSBLOCK && nullfb) {
+               args.fsbno = 0;
+               args.type = XFS_ALLOCTYPE_FIRST_AG;
+               args.total = ap->minlen;
+               args.minleft = 0;
+               if ((error = xfs_alloc_vextent(&args)))
+                       return error;
+               ap->low = 1;
+       }
+       if (args.fsbno != NULLFSBLOCK) {
+               ap->firstblock = ap->rval = args.fsbno;
+               ASSERT(nullfb || fb_agno == args.agno ||
+                      (ap->low && fb_agno < args.agno));
+               ap->alen = args.len;
+               ap->ip->i_d.di_nblocks += args.len;
+               xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
+               if (ap->wasdel)
+                       ap->ip->i_delayed_blks -= args.len;
+               /*
+                * Adjust the disk quota also. This was reserved
+                * earlier.
+                */
+               XFS_TRANS_MOD_DQUOT_BYINO(mp, ap->tp, ap->ip,
+                       ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT :
+                                       XFS_TRANS_DQ_BCOUNT,
+                       (long) args.len);
+       } else {
+               ap->rval = NULLFSBLOCK;
+               ap->alen = 0;
        }
        return 0;
-#undef ISVALID
+}
+
+/*
+ * xfs_bmap_alloc is called by xfs_bmapi to allocate an extent for a file.
+ * It figures out where to ask the underlying allocator to put the new extent.
+ */
+STATIC int
+xfs_bmap_alloc(
+       xfs_bmalloca_t  *ap)            /* bmap alloc argument struct */
+{
+       if ((ap->ip->i_d.di_flags & XFS_DIFLAG_REALTIME) && ap->userdata)
+               return xfs_bmap_rtalloc(ap);
+       return xfs_bmap_btalloc(ap);
 }
 
 /*
@@ -3392,7 +3414,8 @@ xfs_bmap_local_to_extents(
 
                args.tp = tp;
                args.mp = ip->i_mount;
-               ASSERT(ifp->if_flags & XFS_IFINLINE);
+               ASSERT((ifp->if_flags &
+                       (XFS_IFINLINE|XFS_IFEXTENTS|XFS_IFEXTIREC)) == XFS_IFINLINE);
                /*
                 * Allocate a block.  We know we need only one, since the
                 * file currently fits in an inode.
@@ -3551,6 +3574,57 @@ xfs_bmap_do_search_extents(
        return ep;
 }
 
+/*
+ * Search the extent records for the entry containing block bno.
+ * If bno lies in a hole, point to the next entry.  If bno lies
+ * past eof, *eofp will be set, and *prevp will contain the last
+ * entry (null if none).  Else, *lastxp will be set to the index
+ * of the found entry; *gotp will contain the entry.
+ */
+xfs_bmbt_rec_t *                       /* pointer to found extent entry */
+xfs_bmap_search_multi_extents(
+       xfs_ifork_t     *ifp,           /* inode fork pointer */
+       xfs_fileoff_t   bno,            /* block number searched for */
+       int             *eofp,          /* out: end of file found */
+       xfs_extnum_t    *lastxp,        /* out: last extent index */
+       xfs_bmbt_irec_t *gotp,          /* out: extent entry found */
+       xfs_bmbt_irec_t *prevp)         /* out: previous extent entry found */
+{
+       xfs_bmbt_rec_t  *ep;            /* extent record pointer */
+       xfs_extnum_t    lastx;          /* last extent index */
+
+       /*
+        * Initialize the extent entry structure to catch access to
+        * uninitialized br_startblock field.
+        */
+       gotp->br_startoff = 0xffa5a5a5a5a5a5a5LL;
+       gotp->br_blockcount = 0xa55a5a5a5a5a5a5aLL;
+       gotp->br_state = XFS_EXT_INVALID;
+#if XFS_BIG_BLKNOS
+       gotp->br_startblock = 0xffffa5a5a5a5a5a5LL;
+#else
+       gotp->br_startblock = 0xffffa5a5;
+#endif
+       prevp->br_startoff = NULLFILEOFF;
+
+       ep = xfs_iext_bno_to_ext(ifp, bno, &lastx);
+       if (lastx > 0) {
+               xfs_bmbt_get_all(xfs_iext_get_ext(ifp, lastx - 1), prevp);
+       }
+       if (lastx < (ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t))) {
+               xfs_bmbt_get_all(ep, gotp);
+               *eofp = 0;
+       } else {
+               if (lastx > 0) {
+                       *gotp = *prevp;
+               }
+               *eofp = 1;
+               ep = NULL;
+       }
+       *lastxp = lastx;
+       return ep;
+}
+
 /*
  * Search the extents list for the inode, for the extent containing bno.
  * If bno lies in a hole, point to the next entry.  If bno lies past eof,
@@ -3569,20 +3643,14 @@ xfs_bmap_search_extents(
        xfs_bmbt_irec_t *prevp)         /* out: previous extent entry found */
 {
        xfs_ifork_t     *ifp;           /* inode fork pointer */
-       xfs_bmbt_rec_t  *base;          /* base of extent list */
-       xfs_extnum_t    lastx;          /* last extent index used */
-       xfs_extnum_t    nextents;       /* number of file extents */
        xfs_bmbt_rec_t  *ep;            /* extent record pointer */
        int             rt;             /* realtime flag    */
 
        XFS_STATS_INC(xs_look_exlist);
        ifp = XFS_IFORK_PTR(ip, whichfork);
-       lastx = ifp->if_lastex;
-       nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
-       base = &ifp->if_u1.if_extents[0];
 
-       ep = xfs_bmap_do_search_extents(base, lastx, nextents, bno, eofp,
-                                         lastxp, gotp, prevp);
+       ep = xfs_bmap_search_multi_extents(ifp, bno, eofp, lastxp, gotp, prevp);
+
        rt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(ip);
        if (unlikely(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM))) {
                 cmn_err(CE_PANIC,"Access to block zero: fs: <%s> inode: %lld "
@@ -4586,10 +4654,6 @@ xfs_bmapi(
        xfs_btree_cur_t *cur;           /* bmap btree cursor */
        xfs_fileoff_t   end;            /* end of mapped file region */
        int             eof;            /* we've hit the end of extents */
-       char            contig;         /* allocation must be one extent */
-       char            delay;          /* this request is for delayed alloc */
-       char            exact;          /* don't do all of wasdelayed extent */
-       char            convert;        /* unwritten extent I/O completion */
        xfs_bmbt_rec_t  *ep;            /* extent record pointer */
        int             error;          /* error return */
        xfs_bmbt_irec_t got;            /* current file extent record */
@@ -4608,13 +4672,9 @@ xfs_bmapi(
        int             tmp_logflags;   /* temp flags holder */
        int             whichfork;      /* data or attr fork */
        char            inhole;         /* current location is hole in file */
-       char            stateless;      /* ignore state flag set */
-       char            trim;           /* output trimmed to match range */
-       char            userdata;       /* allocating non-metadata */
        char            wasdelay;       /* old extent was delayed */
        char            wr;             /* this is a write request */
        char            rt;             /* this is a realtime file */
-       char            rsvd;           /* OK to allocate reserved blocks */
 #ifdef DEBUG
        xfs_fileoff_t   orig_bno;       /* original block number value */
        int             orig_flags;     /* original flags arg value */
@@ -4651,15 +4711,8 @@ xfs_bmapi(
                XFS_STATS_INC(xs_blk_mapw);
        else
                XFS_STATS_INC(xs_blk_mapr);
-       delay = (flags & XFS_BMAPI_DELAY) != 0;
-       trim = (flags & XFS_BMAPI_ENTIRE) == 0;
-       userdata = (flags & XFS_BMAPI_METADATA) == 0;
-       convert = (flags & XFS_BMAPI_CONVERT) != 0;
-       exact = (flags & XFS_BMAPI_EXACT) != 0;
-       rsvd = (flags & XFS_BMAPI_RSVBLOCKS) != 0;
-       contig = (flags & XFS_BMAPI_CONTIG) != 0;
        /*
-        * stateless is used to combine extents which
+        * IGSTATE flag is used to combine extents which
         * differ only due to the state of the extents.
         * This technique is used from xfs_getbmap()
         * when the caller does not wish to see the
@@ -4675,10 +4728,9 @@ xfs_bmapi(
         * xfs_strat_comp(), where the xfs_bmapi() call
         * is transactioned, and the extents combined.
         */
-       stateless = (flags & XFS_BMAPI_IGSTATE) != 0;
-       if (stateless && wr)    /* if writing unwritten space, no */
-               wr = 0;         /* allocations are allowed */
-       ASSERT(wr || !delay);
+       if ((flags & XFS_BMAPI_IGSTATE) && wr)  /* if writing unwritten space */
+               wr = 0;                         /* no allocations are allowed */
+       ASSERT(wr || !(flags & XFS_BMAPI_DELAY));
        logflags = 0;
        nallocs = 0;
        cur = NULL;
@@ -4713,7 +4765,7 @@ xfs_bmapi(
                if (eof && !wr)
                        got.br_startoff = end;
                inhole = eof || got.br_startoff > bno;
-               wasdelay = wr && !inhole && !delay &&
+               wasdelay = wr && !inhole && !(flags & XFS_BMAPI_DELAY) &&
                        ISNULLSTARTBLOCK(got.br_startblock);
                /*
                 * First, deal with the hole before the allocated space
@@ -4725,7 +4777,7 @@ xfs_bmapi(
                         * allocate the stuff asked for in this bmap call
                         * but that wouldn't be as good.
                         */
-                       if (wasdelay && !exact) {
+                       if (wasdelay && !(flags & XFS_BMAPI_EXACT)) {
                                alen = (xfs_extlen_t)got.br_blockcount;
                                aoff = got.br_startoff;
                                if (lastx != NULLEXTNUM && lastx) {
@@ -4747,8 +4799,8 @@ xfs_bmapi(
                                                        got.br_startoff - bno);
                                aoff = bno;
                        }
-                       minlen = contig ? alen : 1;
-                       if (delay) {
+                       minlen = (flags & XFS_BMAPI_CONTIG) ? alen : 1;
+                       if (flags & XFS_BMAPI_DELAY) {
                                xfs_extlen_t    extsz;
 
                                /* Figure out the extent size, adjust alen */
@@ -4761,7 +4813,9 @@ xfs_bmapi(
                                if (extsz) {
                                        error = xfs_bmap_extsize_align(mp,
                                                        &got, &prev, extsz,
-                                                       rt, eof, delay, convert,
+                                                       rt, eof,
+                                                       flags&XFS_BMAPI_DELAY,
+                                                       flags&XFS_BMAPI_CONVERT,
                                                        &aoff, &alen);
                                        ASSERT(!error);
                                }
@@ -4799,24 +4853,29 @@ xfs_bmapi(
                                if (rt) {
                                        error = xfs_mod_incore_sb(mp,
                                                        XFS_SBS_FREXTENTS,
-                                                       -(extsz), rsvd);
+                                                       -(extsz), (flags &
+                                                       XFS_BMAPI_RSVBLOCKS));
                                } else {
                                        error = xfs_mod_incore_sb(mp,
                                                        XFS_SBS_FDBLOCKS,
-                                                       -(alen), rsvd);
+                                                       -(alen), (flags &
+                                                       XFS_BMAPI_RSVBLOCKS));
                                }
                                if (!error) {
                                        error = xfs_mod_incore_sb(mp,
                                                        XFS_SBS_FDBLOCKS,
-                                                       -(indlen), rsvd);
+                                                       -(indlen), (flags &
+                                                       XFS_BMAPI_RSVBLOCKS));
                                        if (error && rt)
                                                xfs_mod_incore_sb(mp,
                                                        XFS_SBS_FREXTENTS,
-                                                       extsz, rsvd);
+                                                       extsz, (flags &
+                                                       XFS_BMAPI_RSVBLOCKS));
                                        else if (error)
                                                xfs_mod_incore_sb(mp,
                                                        XFS_SBS_FDBLOCKS,
-                                                       alen, rsvd);
+                                                       alen, (flags &
+                                                       XFS_BMAPI_RSVBLOCKS));
                                }
 
                                if (error) {
@@ -4849,7 +4908,7 @@ xfs_bmapi(
                                /* Indicate if this is the first user data
                                 * in the file, or just any user data.
                                 */
-                               if (userdata) {
+                               if (!(flags & XFS_BMAPI_METADATA)) {
                                        bma.userdata = (aoff == 0) ?
                                                XFS_ALLOC_INITIAL_USER_DATA :
                                                XFS_ALLOC_USERDATA;
@@ -4861,7 +4920,7 @@ xfs_bmapi(
                                bma.firstblock = *firstblock;
                                bma.alen = alen;
                                bma.off = aoff;
-                               bma.conv = convert;
+                               bma.conv = (flags & XFS_BMAPI_CONVERT);
                                bma.wasdel = wasdelay;
                                bma.minlen = minlen;
                                bma.low = flist->xbf_low;
@@ -4872,7 +4931,8 @@ xfs_bmapi(
                                 * is larger than a stripe unit.
                                 */
                                if (mp->m_dalign && alen >= mp->m_dalign &&
-                                   userdata && whichfork == XFS_DATA_FORK) {
+                                   (!(flags & XFS_BMAPI_METADATA)) &&
+                                   (whichfork == XFS_DATA_FORK)) {
                                        if ((error = xfs_bmap_isaeof(ip, aoff,
                                                        whichfork, &bma.aeof)))
                                                goto error0;
@@ -4935,7 +4995,7 @@ xfs_bmapi(
                        }
                        error = xfs_bmap_add_extent(ip, lastx, &cur, &got,
                                firstblock, flist, &tmp_logflags, whichfork,
-                               rsvd);
+                               (flags & XFS_BMAPI_RSVBLOCKS));
                        logflags |= tmp_logflags;
                        if (error)
                                goto error0;
@@ -4947,7 +5007,7 @@ xfs_bmapi(
                        ASSERT(got.br_startoff + got.br_blockcount >=
                                aoff + alen);
 #ifdef DEBUG
-                       if (delay) {
+                       if (flags & XFS_BMAPI_DELAY) {
                                ASSERT(ISNULLSTARTBLOCK(got.br_startblock));
                                ASSERT(STARTBLOCKVAL(got.br_startblock) > 0);
                        }
@@ -4976,14 +5036,15 @@ xfs_bmapi(
                 * Then deal with the allocated space we found.
                 */
                ASSERT(ep != NULL);
-               if (trim && (got.br_startoff + got.br_blockcount > obno)) {
+               if (!(flags & XFS_BMAPI_ENTIRE) &&
+                   (got.br_startoff + got.br_blockcount > obno)) {
                        if (obno > bno)
                                bno = obno;
                        ASSERT((bno >= obno) || (n == 0));
                        ASSERT(bno < end);
                        mval->br_startoff = bno;
                        if (ISNULLSTARTBLOCK(got.br_startblock)) {
-                               ASSERT(!wr || delay);
+                               ASSERT(!wr || (flags & XFS_BMAPI_DELAY));
                                mval->br_startblock = DELAYSTARTBLOCK;
                        } else
                                mval->br_startblock =
@@ -5005,7 +5066,7 @@ xfs_bmapi(
                } else {
                        *mval = got;
                        if (ISNULLSTARTBLOCK(mval->br_startblock)) {
-                               ASSERT(!wr || delay);
+                               ASSERT(!wr || (flags & XFS_BMAPI_DELAY));
                                mval->br_startblock = DELAYSTARTBLOCK;
                        }
                }
@@ -5031,7 +5092,7 @@ xfs_bmapi(
                        mval->br_state = XFS_EXT_NORM;
                        error = xfs_bmap_add_extent(ip, lastx, &cur, mval,
                                firstblock, flist, &tmp_logflags, whichfork,
-                               rsvd);
+                               (flags & XFS_BMAPI_RSVBLOCKS));
                        logflags |= tmp_logflags;
                        if (error)
                                goto error0;
@@ -5048,9 +5109,10 @@ xfs_bmapi(
                                continue;
                }
 
-               ASSERT(!trim ||
+               ASSERT((flags & XFS_BMAPI_ENTIRE) ||
                       ((mval->br_startoff + mval->br_blockcount) <= end));
-               ASSERT(!trim || (mval->br_blockcount <= len) ||
+               ASSERT((flags & XFS_BMAPI_ENTIRE) ||
+                      (mval->br_blockcount <= len) ||
                       (mval->br_startoff < obno));
                bno = mval->br_startoff + mval->br_blockcount;
                len = end - bno;
@@ -5065,7 +5127,8 @@ xfs_bmapi(
                           mval[-1].br_startblock != HOLESTARTBLOCK &&
                           mval->br_startblock ==
                           mval[-1].br_startblock + mval[-1].br_blockcount &&
-                          (stateless || mval[-1].br_state == mval->br_state)) {
+                          ((flags & XFS_BMAPI_IGSTATE) ||
+                               mval[-1].br_state == mval->br_state)) {
                        ASSERT(mval->br_startoff ==
                               mval[-1].br_startoff + mval[-1].br_blockcount);
                        mval[-1].br_blockcount += mval->br_blockcount;