oracleasm: Fix two merge errors

Fix two bugs introduced while bringing oracleasm up to date with
mainline.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit faf0fb8aecf08f8abaf5972af888a1b17af7d7d3)

diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c
index b14d00b80f24168c2823456a8af09537f8e3291f..39b6c918a40d43191ea64ab961c3fe045be9ef48 100644 (file)
--- a/drivers/block/oracleasm/driver.c
+++ b/drivers/block/oracleasm/driver.c
@@ -1044,6 +1044,9 @@ static struct asm_request *asm_request_alloc(void)
 
        r = kmem_cache_zalloc(asm_request_cachep, GFP_KERNEL);
 
+       if (r)
+               r->r_status = ASM_SUBMITTED;
+
        return r;
 }  /* asm_request_alloc() */
 
@@ -2821,7 +2824,7 @@ static struct dentry *asmfs_mount(struct file_system_type *fs_type,
                                       int flags, const char *dev_name,
                                       void *data)
 {
-       return mount_bdev(fs_type, flags, dev_name, data, asmfs_fill_super);
+       return mount_nodev(fs_type, flags, data, asmfs_fill_super);
 }
 
 static struct file_system_type asmfs_fs_type = {