xfs: slightly tweak an assert in xfs_fs_map_blocks

commit 88cdb7147b21b2d8b4bd3f3d95ce0bffd73e1ac3 upstream.

We should never see delalloc blocks for a pNFS layout, write or not.
Adjust the assert to check for that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c
index f63fe8d924a363cf6f680693d900af6019922f10..058af699e046c179291c534609e4cc706bfa0baf 100644 (file)
--- a/fs/xfs/xfs_pnfs.c
+++ b/fs/xfs/xfs_pnfs.c
@@ -147,11 +147,11 @@ xfs_fs_map_blocks(
        if (error)
                goto out_unlock;
 
+       ASSERT(!nimaps || imap.br_startblock != DELAYSTARTBLOCK);
+
        if (write) {
                enum xfs_prealloc_flags flags = 0;
 
-               ASSERT(imap.br_startblock != DELAYSTARTBLOCK);
-
                if (!nimaps || imap.br_startblock == HOLESTARTBLOCK) {
                        /*
                         * xfs_iomap_write_direct() expects to take ownership of