diff options
| author | Sage Weil <sage@inktank.com> | 2012-05-19 23:56:49 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-05-20 23:12:02 +0200 |
| commit | deccc592c52bc757b35f6b05f00cfd2b433b395c (patch) | |
| tree | 11bff90646b70c4bfbbe79e8e9046448406ea79e | |
| parent | debian: fix ceph-kdump-copy.init (diff) | |
| download | ceph-deccc592c52bc757b35f6b05f00cfd2b433b395c.tar.xz ceph-deccc592c52bc757b35f6b05f00cfd2b433b395c.zip | |
filestore: do not test xattrs on fsid file
This is sufficient to break our fcntl lock, which breaks the check for
other running daemons.
Broken by f03dc34f7e2fc1707fa00339b917c0d2c93dbdd3
Fixes: #2452
Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/os/FileStore.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 3b8171b598c..c144fd21213 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1312,7 +1312,7 @@ int FileStore::_detect_fs() char fn[PATH_MAX]; int x = rand(); int y = x+1; - snprintf(fn, sizeof(fn), "%s/fsid", basedir.c_str()); + snprintf(fn, sizeof(fn), "%s/whoami", basedir.c_str()); int ret = do_setxattr(fn, "user.test", &x, sizeof(x)); if (ret >= 0) ret = do_getxattr(fn, "user.test", &y, sizeof(y)); |