[XFS] kill BMAPI_UNWRITTEN

There is no reason to go through xfs_iomap for the BMAPI_UNWRITTEN because
it has nothing in common with the other cases. Instead check for the
shutdown filesystem in xfs_end_bio_unwritten and perform a direct call to
xfs_iomap_write_unwritten (which should be renamed to something more
sensible one day)

SGI-PV: 970241
SGI-Modid: xfs-linux-melb:xfs-kern:29681a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 58cda06a1846..21ca62880514 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -191,9 +191,7 @@ xfs_iomap(
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
 
-        switch (flags &
-                (BMAPI_READ | BMAPI_WRITE | BMAPI_ALLOCATE |
-                 BMAPI_UNWRITTEN)) {
+        switch (flags & (BMAPI_READ | BMAPI_WRITE | BMAPI_ALLOCATE)) {
         case BMAPI_READ:
                 xfs_iomap_enter_trace(XFS_IOMAP_READ_ENTER, io, offset, count);
                 lockmode = XFS_LCK_MAP_SHARED(mp, io);
@@ -218,8 +216,6 @@ xfs_iomap(
                         XFS_ILOCK(mp, io, lockmode);
                 }
                 break;
-        case BMAPI_UNWRITTEN:
-                goto phase2;
         default:
                 BUG();
         }
@@ -238,8 +234,7 @@ xfs_iomap(
         if (error)
                 goto out;
 
-phase2:
-        switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE|BMAPI_UNWRITTEN)) {
+        switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE)) {
         case BMAPI_WRITE:
                 /* If we found an extent, return it */
                 if (nimaps &&
@@ -277,11 +272,6 @@ phase2:
                 error = XFS_IOMAP_WRITE_ALLOCATE(mp, io, offset, count,
                                                  &imap, &nimaps);
                 break;
-        case BMAPI_UNWRITTEN:
-                lockmode = 0;
-                error = XFS_IOMAP_WRITE_UNWRITTEN(mp, io, offset, count);
-                nimaps = 0;
-                break;
         }
 
         if (nimaps) {