From deccc592c52bc757b35f6b05f00cfd2b433b395c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 19 May 2012 14:56:49 -0700 Subject: [PATCH] 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 --- src/os/FileStore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 3b8171b598c2f..c144fd21213ff 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)); -- 2.39.5