From 0b83d08c48b58f7765af454ad3b90e614692aa25 Mon Sep 17 00:00:00 2001
From: anserper <anserper>
Date: Mon, 3 Nov 2008 21:21:03 +0000
Subject: [PATCH] b=17493 i=Andreas Dilger i=Johann Lombardi handling of a
 broken readonly key

---
 lustre/llite/llite_lib.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 638f17d..0b173cd 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -2268,6 +2268,17 @@ int ll_remount_fs(struct super_block *sb, int *flags, char *data)
                 err = obd_set_info_async(sbi->ll_mdc_exp, sizeof(KEY_READONLY),
                                          KEY_READONLY, sizeof(read_only),
                                          &read_only, NULL);
+
+                /* MDS might have expected a different ro key value, b=17493 */
+                if (err == -EINVAL) {
+                        CDEBUG(D_CONFIG, "Retrying remount with 1.6.6 ro key\n");
+                        err = obd_set_info_async(sbi->ll_mdc_exp,
+                                                 sizeof(KEY_READONLY_166COMPAT),
+                                                 KEY_READONLY_166COMPAT,
+                                                 sizeof(read_only),
+                                                 &read_only, NULL);
+                }
+
                 if (err) {
                         CERROR("Failed to change the read-only flag during "
                                "remount: %d\n", err);
-- 
1.8.3.1