X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Fblock_dev.c;h=08ae99343d92f91586b49fbf56367906855415ff;hb=fba597db4218ac324eee34b64736ea94829c95bf;hp=c3cdde87cc8c678542bab9c39f12477058986156;hpb=14a5916e0cce6dbc9acedc99576261c6568689d2;p=cascardo%2Flinux.git

diff --git a/fs/block_dev.c b/fs/block_dev.c
index c3cdde87cc8c..08ae99343d92 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -249,7 +249,8 @@ struct super_block *freeze_bdev(struct block_device *bdev)
 		 * thaw_bdev drops it.
 		 */
 		sb = get_super(bdev);
-		drop_super(sb);
+		if (sb)
+			drop_super(sb);
 		mutex_unlock(&bdev->bd_fsfreeze_mutex);
 		return sb;
 	}
@@ -646,7 +647,7 @@ static struct dentry *bd_mount(struct file_system_type *fs_type,
 {
 	struct dentry *dent;
 	dent = mount_pseudo(fs_type, "bdev:", &bdev_sops, NULL, BDEVFS_MAGIC);
-	if (dent)
+	if (!IS_ERR(dent))
 		dent->d_sb->s_iflags |= SB_I_CGROUPWB;
 	return dent;
 }