From f2e1d2f1e2df30473d9ba884496f6c296e0ce848 Mon Sep 17 00:00:00 2001 From: girish Date: Wed, 28 Jan 2009 03:52:32 +0000 Subject: [PATCH] b=16895 i=adilger (o=johann) i=girish dont assert on lvfs_check_rdonly() --- lustre/mgs/mgs_handler.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c index e30a0f5..80179f8 100644 --- a/lustre/mgs/mgs_handler.c +++ b/lustre/mgs/mgs_handler.c @@ -191,7 +191,11 @@ static int mgs_setup(struct obd_device *obd, obd_count len, void *buf) ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL, "mgs_ldlm_client", &obd->obd_ldlm_client); - LASSERT(!lvfs_check_rdonly(lvfs_sbdev(mnt->mnt_sb))); + if (lvfs_check_rdonly(lvfs_sbdev(mnt->mnt_sb))) { + CERROR("%s: Underlying device is marked as read-only. " + "Setup failed\n", obd->obd_name); + GOTO(err_ops, rc = -EROFS); + } rc = mgs_fs_setup(obd, mnt); if (rc) { -- 1.8.3.1