diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-29 10:26:56 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-29 10:26:56 -0700 |
| commit | 532dee523ab250dc08cb96578ef8bcc6bba55584 (patch) | |
| tree | 8a0a1320d8d9b71bac35c7dea678ea175b49430d /src/mds/locks.c | |
| parent | 1d0aa2add3fd768d767ae3b0d4d62922904aae94 (diff) | |
| parent | 7e0e0963ed027387f3d575c532dd85ae029ed063 (diff) | |
| download | ceph-532dee523ab250dc08cb96578ef8bcc6bba55584.tar.gz | |
Merge remote-tracking branch 'yan/wip-mds'
Reviewed-by: Sage Weil <sage@inktank.com>
Conflicts:
src/mds/MDCache.cc
Diffstat (limited to 'src/mds/locks.c')
| -rw-r--r-- | src/mds/locks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/locks.c b/src/mds/locks.c index c7dd5bec0ee..90310874411 100644 --- a/src/mds/locks.c +++ b/src/mds/locks.c @@ -97,8 +97,8 @@ const struct sm_state_t filelock[LOCK_MAX] = { [LOCK_XSYN_SYNC] = { LOCK_SYNC, true, LOCK_LOCK, AUTH, 0, AUTH,0, 0, 0, 0, 0,CEPH_CAP_GCACHE,0,0 }, [LOCK_LOCK] = { 0, false, LOCK_LOCK, AUTH, 0, REQ, AUTH,0, 0, 0, CEPH_CAP_GCACHE|CEPH_CAP_GBUFFER,0,0,0 }, - [LOCK_SYNC_LOCK] = { LOCK_LOCK, false, LOCK_LOCK, AUTH, 0, REQ, 0, 0, 0, 0, CEPH_CAP_GCACHE,0,0,CEPH_CAP_GCACHE }, - [LOCK_EXCL_LOCK] = { LOCK_LOCK, false, LOCK_LOCK, 0, 0, 0, 0, XCL, 0, 0, CEPH_CAP_GCACHE|CEPH_CAP_GBUFFER,0,0,CEPH_CAP_GCACHE }, + [LOCK_SYNC_LOCK] = { LOCK_LOCK, false, LOCK_LOCK, AUTH, 0, REQ, 0, 0, 0, 0, CEPH_CAP_GCACHE,0,0,0 }, + [LOCK_EXCL_LOCK] = { LOCK_LOCK, false, LOCK_LOCK, 0, 0, 0, 0, XCL, 0, 0, CEPH_CAP_GCACHE|CEPH_CAP_GBUFFER,0,0,0 }, [LOCK_MIX_LOCK] = { LOCK_LOCK, false, LOCK_MIX, AUTH, 0, REQ, 0, 0, 0, 0, 0,0,0,0 }, [LOCK_MIX_LOCK2] = { LOCK_LOCK, false, LOCK_LOCK, AUTH, 0, REQ, 0, 0, 0, 0, 0,0,0,0 }, |