mailmap: Kevin Jones affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Lukasz Jagiello affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Mauricio Garavaglia affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Patrick Donnelly affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Rachana Patel affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Roi Dayan affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Wei Jin affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Jianjian Huo affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Sahithi R V affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Marcel Lauhoff affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Robert LeBlanc affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Erwan Velu affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Barbora Ančincová affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: fangdong affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Jingkai Yuan affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Harry Harrington affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Tao Chang affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Shishir Gowda affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Adam Twardowski affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Shun Song affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: some duplicates found on .organizationmap

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Luo Kexue affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Aron Gunn affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: further cleanup.

Somehow a followup to #581c65dd48807a516b43adec4b5be29c040db8c7

Work was half-done, and mailmap can be further simplified without changing outpout of the script credits.sh

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Abhishek Lekshmanan affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Darrell Enns affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Ilya Shipitsin affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Li Tianqing affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Yehua Chen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Ren Huanwen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: YiQiang Chen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Zhi Zhang affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: François Lafont affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Liu Peiyan affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Dunrong Huang affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Xie Xingguo affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Song Baisen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Zhiqiang Wang affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Xiangwei Wu affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Adam C. Emerson affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>

mailmap: Cleanup.

Over time, some entries were unnecessarily complicated.

Entries were sometimes of the form :

Canonical name <canonical@email> first other name <other@mail1>
Canonical name <canonical@email> second other name <other@mail1>
Canonical name <canonical@email> OOops my mailer is wrongly configured <other@mail1>
...

This can be simplified like this :
Canonical name <canonical@email>
Canonical name <canonical@email> <other@mail1>

The added benefit is that we're now exempt of adding a line in .mailmap every time an author make a typo. That will save us time.

Also for name normalisation, a single entry Canonical name <complicated@email> is often enough.

Signed-off-by: Yann Dupont <yann@objoo.org>

Merge pull request #7507 from tchaikov/wip-cmake

cmake: add KernelDevice.cc to libos_srcs

Reviewed-by: Samuel Just <sjust@redhat.com>

cmake: add KernelDevice.cc to libos_srcs

which fixes the build

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge remote-tracking branch 'gh/jewel'

Merge branch 'wip-rados-bench'

rados: Add units to rados bench output

Fixes: #12248
Signed-off-by: Gu Zhongyan <guzhongyan@360.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7386 from liewegas/wip-features

osd: skip redirect encoding if we can

Reviewed-by: Sage Weil <sage@redhat.com>

Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge branch 'gelf-logging-backend' of git://github.com/irq0/ceph

Reviewed-by: Kefu Chai <kchai@redhat.com>

scripts/run-coverity: fix upload process

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #7357 from zhengbinh3c/master

osd: fix memory leak in ReplicatedPG.cc error path

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7362 from xiexingguo/xxg-wip-fixbs

osd: BlueStore: fix fsck and blockdevice read-relevant issue

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7468 from liewegas/wip-test-fuse

qa/workunits/objectstore/test_fuse.sh: fix root check

Merge pull request #7476 from tchaikov/wip-include-expat-in-source

rgw: do not include "expat.h" in header file

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7479 from roidayan/fix_xio_compilation

msg/xio: fix compilation

ceph_test_objectstore: fix warning

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore/KernelDevice: explicit on ctor

This was lost in the wip-spdk merge.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #7467 from liewegas/wip-scrub-start

osd: fix scrub start hobject

Merge branch 'wip-spdk' of git://github.com/yuyuyu101/ceph

Reviewed-by: Sage Weil <sage@redhat.com>

Merge remote-tracking branch 'me/wip-lockdep'

Merge pull request #7438 from ifed01/wip-pgbackend-cleanup

osd: cleanup OSD/PGBackend interface a bit

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #7480 from trociny/fix-journal-commit_position_task

journal: reset commit_position_task_ctx pointer after task complete

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

script/run-coverity: fix user

Signed-off-by: Sage Weil <sage@redhat.com>

journal: reset commit_position_task_ctx pointer after task complete

Otherwise, schedule_commit_task() would never schedule the next task
and the commit position would not be committed until shutdown.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

Merge remote-tracking branch 'gh/wip-da-SCA-20150910'

Reviewed-by: Kefu Chai <kchai@redhat.com>

xio: fix compilation

Signed-off-by: Roi Dayan <roid@mellanox.com>

Merge pull request #7473 from yehudasa/wip-14516

rgw-admin: document orphans commands in usage

Merge pull request #7451 from wjin/fix

msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

rgw: do not include "expat.h" in heade file

Building Ceph without the Expat development library currently results in
the following build error:

~/ceph> ./configure --without-fuse --without-tcmalloc --without-radosgw
...
~/ceph> make
...
CXX ceph_dencoder-rgw_dencoder.o
In file included from rgw/rgw_dencoder.cc:6:0:
rgw/rgw_acl_s3.h:9:19: fatal error: expat.h: No such file or directory

The ceph-dencoder binary is built with rgw_dencoder.cc, which includes
rgw_acl_s3.h, which in turn includes expat.h. However, configure.ac
currently only checks for Expat as part of radosgw.

but we don't need expat.h for testing the encoding of rgw structs, so
move "#include <expat.h>" into the source file to avoid this dependency.
and as a side effect, this also speed up the compilation.

Signed-off-by: Kefu Chai <kchai@redhat.com>

BlueStore: fix wrong action scope of enode

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #7472 from badone/wip-ceph-disk-typo

ceph-disk: Fix trivial typo

Reviewed-by: Kefu Chai <kchai@redhat.com>

BlueStore: add error handling for clone

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: add error handling for clone_range

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: fix wrong decode logic of nid_max

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: fix unhandled return code from blockdevice APIs

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: try to scan as many errors as possible

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: fix duplicated counting of errors

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: fix enode verification logic

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: add a guard for collection loading

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

BlueStore: add a guard for overlay loading

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #6813 from manens/pybind_rados_snapshot_read

pybind: Implementation of Ioctx.set_read to allow read from snapshots

Reviewed-by: Kefu Chai <kchai@redhat.com>

rgw-admin: document orphans commands in usage

Fixes: #14516
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

ceph-disk: Fix trivial typo

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

msg: ignore request_redirect_t encode/decode when we not need

Signed-off-by: Xinze Chi <xinze@xsky.com>

Merge pull request #7445 from xiexingguo/xxg-wip-mem

osd: memstore: fix blocksize for statfs

Reviewed-by: Sage Weil <sage@redhat.com>

qa/workunits/objectstore/test_fuse.sh: fix root check

$EUID not defined everywhere.

Signed-off-by: Sage Weil <sage@redhat.com>

os/memstore: disable lockdep on Collection::lock

Signed-off-by: Sage Weil <sage@redhat.com>

os/kstore: disable lockdep on Collection::lock

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore: disable lockdep on Collection::lock

Signed-off-by: Sage Weil <sage@redhat.com>

os/filestore/CollectionIndex: disable lockdep on access_lock

This overflows the lockdep table when there are too many PGs. This
code is static so I'm not worried about new locking bugs.

Signed-off-by: Sage Weil <sage@redhat.com>

common/RWLock: alloc lockdep to be disabled

Signed-off-by: Sage Weil <sage@redhat.com>

lockdep: dump lock names if we run out of IDs

..just in case we are doing something silly, like misnaming locks.

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore: fix typo (again)

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #7400 from yuyuyu101/wip-13938

librbd: Avoid create two threads per image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #7409 from dillaman/wip-librbd-watch-notify

tests: improve simulation of watch/notify handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6562 from Aran85/authedpermcheck

rgw: fix the condition of  authenticated user's permit check .

osd/PG: fix scrub start object

This was changed in 05d79faa512210b0f0a91640d18db33b887a6e73 but it needs
to be more precise to avoid breaking BlueStore's assertions (that the
start position is within the collection range).

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #7291 from majianpeng/vstart.sh

vstart.sh: If use '-n' delete related source rather than consider '-k'.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

osd/ECTransaction: Removing unused local

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>