]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
Fix libxfs_iput on a non-existent root inode during libxfs init
authorBarry Naujok <bnaujok@sgi.com>
Thu, 20 Nov 2008 14:22:02 +0000 (14:22 +0000)
committerBarry Naujok <bnaujok@sgi.com>
Thu, 20 Nov 2008 14:22:02 +0000 (14:22 +0000)
Merge of master-melb:xfs-cmds:32504a by kenmcd.

  Only do libxfs_iput on root inode if it's not NULL during libxfs init

libxfs/init.c

index 68eb288ed7025628ef8e8cfe166f46d26a64b2b2..75d043e53abc668b8a76df56a2a9b36c47736a4b 100644 (file)
@@ -670,7 +670,8 @@ libxfs_mount(
                ASSERT(mp->m_rootip != NULL);
        }
        if ((flags & LIBXFS_MOUNT_ROOTINOS) && rtmount_inodes(mp)) {
-               libxfs_iput(mp->m_rootip, 0);
+               if (mp->m_rootip)
+                       libxfs_iput(mp->m_rootip, 0);
                return NULL;
        }