Revert "b=22464 add writeconf as mount option (includes bz 23228)"

[fs/lustre-release.git] / lustre / mgs / mgs_handler.c

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index fbbea81..d2ee15d 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -357,10 +357,10 @@ void mgs_revoke_lock(struct obd_device *obd, struct fs_db *fsdb)
 
         LASSERT(fsdb->fsdb_name[0] != '\0');
 
-        if (cfs_test_and_set_bit(1, &fsdb->fsdb_revoking_lock) == 0) {
+        if (cfs_test_and_set_bit(FSDB_REVOKING_LOCK, &fsdb->fsdb_flags) == 0) {
                 lockrc = mgs_get_cfg_lock(obd, fsdb->fsdb_name, &lockh);
                 /* clear the bit before lock put */
-                cfs_clear_bit(1, &fsdb->fsdb_revoking_lock);
+                cfs_clear_bit(FSDB_REVOKING_LOCK, &fsdb->fsdb_flags);
 
                 if (lockrc != ELDLM_OK)
                         CERROR("lock error %d for fs %s\n",