Merge branch 'master' of https://github.com/ceph/ceph
Merge branch 'wip-mds'
msg/Pipe: fix leak of AuthSessionHandler

Init ptr in ctor, delete in dtor.

Reported-by: Yan, Zheng <yan.zheng@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
cls_rbd: move into new location

Be consistent!  Make an example of ourselves!

Signed-off-by: Sage Weil <sage@inktank.com>
librbd: reorg rbd tests

Signed-off-by: Sage Weil <sage@inktank.com>
fix cls_rbd reorg
cls_rgw: reorg test_cls_rgw

Signed-off-by: Sage Weil <sage@inktank.com>
cls_lock: reorg test_cls_lock

Signed-off-by: Sage Weil <sage@inktank.com>
client: Support for fchown

Implement fchown in libcephfs and client,
which is needed by the samba vfs module.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
client: simplify path_walk() loop

Most paths were kludging around the for loop's i++.  Switch to a while
loop to avoid such tomfoolery.

Signed-off-by: Sage Weil <sage@inktank.com>
client: always follow non-trailing symlinks

If we are walking /a/b/c and a or b is a symlink, follow it.  It's only
c that we don't follow when !followsym.

Signed-off-by: Sage Weil <sage@inktank.com>
librados: test/rados-api/* -> test/librados/*

Signed-off-by: Sage Weil <sage@inktank.com>
librados: move misc tests into test/librados/ dir

Signed-off-by: Sage Weil <sage@inktank.com>
msgr: make bind port range configurable

Signed-off-by: Sage Weil <sage@inktank.com>
msgr: change port range from 6800-6900 -> 6800-7100

This allows more OSDs per host.

Signed-off-by: Sage Weil <sage@inktank.com>
msg/Accepter: use derr

Signed-off-by: Sage Weil <sage@inktank.com>
Merge branch 'wip-msgr-ports'

Reviewed-by: Greg Farnum <greg@inktank.com>
Merge branch 'wip-reorg'
PG: use remove_object_with_snap_hardlinks for divergent objects

Otherwise, we end up leaving snap hardlinks in the snapshot
index directories.  This eventually results in an EEXIST error
when we attempt to re-link the clone into place during
recovery.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
PG::merge_old_entry: fix case for divergent prior_version

Previously, we asserted that a log entry with a divergent
prior_version must be a clone.  Consider the following
case:

6'11(6'2)  m foo
7'12(6'3) m bar
7'13(7'12) m bar

If this is merged with:

6'11(6'2)  m foo
8'12(6'4) m baz

we will hit the assert.  The correct behavior is simply to remove
the object as in the clone case.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>