X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fmds%2FSimpleLock.h;h=2c0ff9327c3a48d8425c4601a032babb36b69277;hb=94b1876350060563a6ac95339df15f95fd3ebadc;hp=8c52df733c51a1ec1ceb20cdaff205165d31de2b;hpb=4832b6f0acade977670a37c20ff5dbe69e727416;p=ceph.git diff --git a/ceph/src/mds/SimpleLock.h b/ceph/src/mds/SimpleLock.h index 8c52df733..2c0ff9327 100644 --- a/ceph/src/mds/SimpleLock.h +++ b/ceph/src/mds/SimpleLock.h @@ -177,14 +177,15 @@ protected: private: int num_rdlock; + // XXX not in mempool struct unstable_bits_t { set<__s32> gather_set; // auth+rep. >= 0 is mds, < 0 is client // local state - int num_wrlock, num_xlock; + int num_wrlock = 0, num_xlock = 0; MutationRef xlock_by; - client_t xlock_by_client; - client_t excl_client; + client_t xlock_by_client = -1; + client_t excl_client = -1; bool empty() { return @@ -196,11 +197,7 @@ private: excl_client == -1; } - unstable_bits_t() : num_wrlock(0), - num_xlock(0), - xlock_by(), - xlock_by_client(-1), - excl_client(-1) {} + unstable_bits_t() {} }; mutable std::unique_ptr _unstable;