summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGui Hecheng <guihecheng@cmss.chinamobile.com>2017-04-12 10:46:49 +0200
committerGui Hecheng <guihecheng@cmss.chinamobile.com>2017-04-14 10:17:01 +0200
commitaccf8cfd22b25650b909f3ee2c2cd5f56203dc2e (patch)
tree04a796839ba81649bead998800b7437a4aa7fcd5
parentMerge pull request #14290 from wjwithagen/wip-wjw-freebsd-procprefix (diff)
downloadceph-accf8cfd22b25650b909f3ee2c2cd5f56203dc2e.tar.xz
ceph-accf8cfd22b25650b909f3ee2c2cd5f56203dc2e.zip
Revert "rgw_file.h: fix potential data race condition"
This reverts commit 3f7b411e1e304e8a6f295dc50b8cf3c6c496f4cc. Causing hung up due to double lock. Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
-rw-r--r--src/rgw/rgw_file.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 42439bedf95..3d671a0dee2 100644
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -534,7 +534,6 @@ namespace rgw {
}
void set_times(real_time t) {
- lock_guard guard(mtx);
state.ctime = real_clock::to_timespec(t);
state.mtime = state.ctime;
state.atime = state.ctime;