2 files changed, 9 insertions, 3 deletions

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index cfe4de5def89..eef27f21f9ab 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1262,7 +1262,7 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr)
 void
 xfs_unmountfs_close(xfs_mount_t *mp, struct cred *cr)
 {
-        if (mp->m_logdev_targp != mp->m_ddev_targp)
+        if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp)
                 xfs_free_buftarg(mp->m_logdev_targp, 1);
         if (mp->m_rtdev_targp)
                 xfs_free_buftarg(mp->m_rtdev_targp, 1);
diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 47c890778bb6..ba8f7a3e4028 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -480,13 +480,19 @@ xfs_mount(
         }
         if (rtdev) {
                 mp->m_rtdev_targp = xfs_alloc_buftarg(rtdev, 1);
-                if (!mp->m_rtdev_targp)
+                if (!mp->m_rtdev_targp) {
+                        xfs_blkdev_put(logdev);
+                        xfs_blkdev_put(rtdev);
                         goto error0;
+                }
         }
         mp->m_logdev_targp = (logdev && logdev != ddev) ?
                                 xfs_alloc_buftarg(logdev, 1) : mp->m_ddev_targp;
-        if (!mp->m_logdev_targp)
+        if (!mp->m_logdev_targp) {
+                xfs_blkdev_put(logdev);
+                xfs_blkdev_put(rtdev);
                 goto error0;
+        }
 
         /*
          * Setup flags based on mount(2) options and then the superblock