summaryrefslogtreecommitdiff
path: root/src/mds/SimpleLock.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-09-07 12:13:39 -0700
committerSage Weil <sage@newdream.net>2010-09-07 12:13:39 -0700
commit90dd3c3e8946d33d96341ab06050f7488fd94d74 (patch)
tree21009a036ae16c1b624b44687ab41938aa97f8dc /src/mds/SimpleLock.h
parent518b95df865911d30be39e5ed2ebb22be81b26d9 (diff)
parentc2c09be383a60ad62c2a080e7e88d904737b7a9e (diff)
downloadceph-90dd3c3e8946d33d96341ab06050f7488fd94d74.tar.gz
Merge branch 'testing' into unstable
Conflicts: configure.ac src/mds/MDCache.cc
Diffstat (limited to 'src/mds/SimpleLock.h')
-rw-r--r--src/mds/SimpleLock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 1151c330514..554eaff0bc1 100644
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -365,7 +365,7 @@ public:
- virtual bool is_dirty() { return false; }
+ virtual bool is_dirty() const { return false; }
// can_*