From faf0fb8aecf08f8abaf5972af888a1b17af7d7d3 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Wed, 28 Dec 2011 14:42:23 -0500 Subject: [PATCH] oracleasm: Fix two merge errors Fix two bugs introduced while bringing oracleasm up to date with mainline. Signed-off-by: Martin K. Petersen --- drivers/block/oracleasm/driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/oracleasm/driver.c b/drivers/block/oracleasm/driver.c index b14d00b80f241..39b6c918a40d4 100644 --- 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 = { -- 2.50.1