Commit a2315823 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-5.5-rc1' of git://github.com/ceph/ceph-client 

Pull ceph updates from Ilya Dryomov:
 "The two highlights are a set of improvements to how rbd read-only
  mappings are handled and a conversion to the new mount API (slightly
  complicated by the fact that we had a common option parsing framework
  that called out into rbd and the filesystem instead of them calling
  into it).

  Also included a few scattered fixes and a MAINTAINERS update for rbd,
  adding Dongsheng as a reviewer"

* tag 'ceph-for-5.5-rc1' of git://github.com/ceph/ceph-client:
  libceph, rbd, ceph: convert to use the new mount API
  rbd: ask for a weaker incompat mask for read-only mappings
  rbd: don't query snapshot features
  rbd: remove snapshot existence validation code
  rbd: don't establish watch for read-only mappings
  rbd: don't acquire exclusive lock for read-only mappings
  rbd: disallow read-write partitions on images mapped read-only
  rbd: treat images mapped read-only seriously
  rbd: introduce RBD_DEV_FLAG_READONLY
  rbd: introduce rbd_is_snap()
  ceph: don't leave ino field in ceph_mds_request_head uninitialized
  ceph: tone down loglevel on ceph_mdsc_build_path warning
  rbd: update MAINTAINERS info
  ceph: fix geting random mds from mdsmap
  rbd: fix spelling mistake "requeueing" -> "requeuing"
  ceph: make several helper accessors take const pointers
  libceph: drop unnecessary check from dispatch() in mon_client.c
parents 7ce4fab8 82995cc6

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -13773,7 +13773,7 @@ F: drivers/media/radio/radio-tea5777.c 
RADOS BLOCK DEVICE (RBD)

M:	Ilya Dryomov <idryomov@gmail.com>

M:	Sage Weil <sage@redhat.com>

M:	Alex Elder <elder@kernel.org>

R:	Dongsheng Yang <dongsheng.yang@easystack.cn>

L:	ceph-devel@vger.kernel.org

W:	http://ceph.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git

drivers/block/rbd.c

+247 −220

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/cache.c

+5 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/ceph/ceph_debug.h>



#include <linux/fs_context.h>

#include "super.h"

#include "cache.h"
@@ -49,7 +50,7 @@ void ceph_fscache_unregister(void) 
	fscache_unregister_netfs(&ceph_cache_netfs);

}



int ceph_fscache_register_fs(struct ceph_fs_client* fsc)

int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)

{

	const struct ceph_fsid *fsid = &fsc->client->fsid;

	const char *fscache_uniq = fsc->mount_options->fscache_uniq;
@@ -66,8 +67,8 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc) 
		if (uniq_len && memcmp(ent->uniquifier, fscache_uniq, uniq_len))

			continue;



		pr_err("fscache cookie already registered for fsid %pU\n", fsid);

		pr_err("  use fsc=%%s mount option to specify a uniquifier\n");

		errorf(fc, "ceph: fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option",

		       fsid);

		err = -EBUSY;

		goto out_unlock;

	}
@@ -95,7 +96,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc) 
		list_add_tail(&ent->list, &ceph_fscache_list);

	} else {

		kfree(ent);

		pr_err("unable to register fscache cookie for fsid %pU\n",

		errorf(fc, "ceph: unable to register fscache cookie for fsid %pU",

		       fsid);

		/* all other fs ignore this error */

	}

fs/ceph/cache.h

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern struct fscache_netfs ceph_cache_netfs; 
int ceph_fscache_register(void);

void ceph_fscache_unregister(void);



int ceph_fscache_register_fs(struct ceph_fs_client* fsc);

int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc);

void ceph_fscache_unregister_fs(struct ceph_fs_client* fsc);



void ceph_fscache_register_inode_cookie(struct inode *inode);
@@ -88,7 +88,8 @@ static inline void ceph_fscache_unregister(void) 
{

}



static inline int ceph_fscache_register_fs(struct ceph_fs_client* fsc)

static inline int ceph_fscache_register_fs(struct ceph_fs_client* fsc,

					   struct fs_context *fc)

{

	return 0;

}

fs/ceph/mds_client.c

+12 −7
Original line number Diff line number Diff line
@@ -2182,13 +2182,17 @@ retry: 
	}

	base = ceph_ino(d_inode(temp));

	rcu_read_unlock();

	if (pos < 0 || read_seqretry(&rename_lock, seq)) {

		pr_err("build_path did not end path lookup where "



	if (read_seqretry(&rename_lock, seq))

		goto retry;



	if (pos < 0) {

		/*

		 * A rename didn't occur, but somehow we didn't end up where

		 * we thought we would. Throw a warning and try again.

		 */

		pr_warn("build_path did not end path lookup where "

			"expected, pos is %d\n", pos);

		/* presumably this is only possible if racing with a

		   rename of one of the parent directories (we can not

		   lock the dentries above us to prevent this, but

		   retrying should be harmless) */

		goto retry;

	}
@@ -2345,6 +2349,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc, 
	head->op = cpu_to_le32(req->r_op);

	head->caller_uid = cpu_to_le32(from_kuid(&init_user_ns, req->r_uid));

	head->caller_gid = cpu_to_le32(from_kgid(&init_user_ns, req->r_gid));

	head->ino = 0;

	head->args = req->r_args;



	ceph_encode_filepath(&p, end, ino1, path1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE