1 files changed, 7 insertions, 3 deletions

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 2b954308a1d6..9e3cc2146d5b 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -582,9 +582,13 @@ xfs_getbmap(
                 }
                 break;
         default:
+                /* Local format data forks report no extents. */
+                if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL) {
+                        bmv->bmv_entries = 0;
+                        return 0;
+                }
                 if (ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS &&
-                    ip->i_d.di_format != XFS_DINODE_FMT_BTREE &&
-                    ip->i_d.di_format != XFS_DINODE_FMT_LOCAL)
+                    ip->i_d.di_format != XFS_DINODE_FMT_BTREE)
                         return -EINVAL;
 
                 if (xfs_get_extsz_hint(ip) ||
@@ -712,7 +716,7 @@ xfs_getbmap(
                          * extents.
                          */
                         if (map[i].br_startblock == DELAYSTARTBLOCK &&
-                            map[i].br_startoff <= XFS_B_TO_FSB(mp, XFS_ISIZE(ip)))
+                            map[i].br_startoff < XFS_B_TO_FSB(mp, XFS_ISIZE(ip)))
                                 ASSERT((iflags & BMV_IF_DELALLOC) != 0);
 
                         if (map[i].br_startblock == HOLESTARTBLOCK &&