From cd5cd721101535bf6f837767e0c0062bf2df4685 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 May 2008 16:22:29 -0700 Subject: [PATCH] mds: fix can_rdlock_soon vs xlock on FileLock --- src/mds/FileLock.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mds/FileLock.h b/src/mds/FileLock.h index 17ef0d5f9426b..aa0b3f0c16278 100644 --- a/src/mds/FileLock.h +++ b/src/mds/FileLock.h @@ -147,7 +147,9 @@ class FileLock : public SimpleLock { } bool can_rdlock_soon() { if (parent->is_auth()) - return (state == LOCK_GLOCKL); + return + (state == LOCK_GLOCKL) || + (state == LOCK_LOCK && xlock_by); else return false; } -- 2.39.5