1 files changed, 12 insertions, 1 deletions

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 1644be14a144..b4db8a208076 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1720,7 +1720,18 @@ xfs_parseargs(
         int                     dsunit, dswidth, vol_dsunit, vol_dswidth;
         int                     iosize;
 
-        args->flags |= XFSMNT_IDELETE;
+        /*
+         * Applications using DMI filesystems often expect the
+         * inode generation number to be monotonically increasing.
+         * If we delete inode chunks we break this assumption, so
+         * keep unused inode chunks on disk for DMI filesystems
+         * until we come up with a better solution.
+         * Note that if "ikeep" or "noikeep" mount options are
+         * supplied, then they are honored.
+         */
+        if (!(args->flags & XFSMNT_DMAPI))
+                args->flags |= XFSMNT_IDELETE;
+
         args->flags |= XFSMNT_BARRIER;
         args->flags2 |= XFSMNT2_COMPAT_IOSIZE;