From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Fri, 29 Jul 2011 21:55:31 +0000 (-0700)
Subject: scatterlock: fix flag assignments.
X-Git-Tag: v0.33~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97c3bcb7fd22159ecc450f830d75129c0a44a5e4;p=ceph.git

scatterlock: fix flag assignments.

Want |= to set a flag, not &=!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h
index 699621099444..42745ce9fdb1 100644
--- a/src/mds/ScatterLock.h
+++ b/src/mds/ScatterLock.h
@@ -105,10 +105,10 @@ public:
   void set_update_stamp(utime_t t) { more()->update_stamp = t; }
 
   void set_scatter_wanted() {
-    more()->state_flags &= SCATTER_WANTED;
+    more()->state_flags |= SCATTER_WANTED;
   }
   void set_unscatter_wanted() {
-    more()->state_flags &= UNSCATTER_WANTED;
+    more()->state_flags |= UNSCATTER_WANTED;
   }
   void clear_scatter_wanted() {
     if (have_more())
@@ -205,7 +205,7 @@ public:
 
 private:
   void set_flushing() {
-    more()->state_flags &= FLUSHING;
+    more()->state_flags |= FLUSHING;
   }
   void clear_flushing() {
     if (have_more()) {
@@ -213,10 +213,10 @@ private:
     }
   }
   void set_flushed() {
-    more()->state_flags &= FLUSHED;
+    more()->state_flags |= FLUSHED;
   }
   void set_dirty() {
-    more()->state_flags &= DIRTY;
+    more()->state_flags |= DIRTY;
   }
   void clear_dirty() {
     if (have_more()) {