Commit 556e2d17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-6.8-rc1' of https://github.com/ceph/ceph-client 

Pull ceph updates from Ilya Dryomov:
 "Assorted CephFS fixes and cleanups with nothing standing out"

* tag 'ceph-for-6.8-rc1' of https://github.com/ceph/ceph-client:
  ceph: get rid of passing callbacks in __dentry_leases_walk()
  ceph: d_obtain_{alias,root}(ERR_PTR(...)) will do the right thing
  ceph: fix invalid pointer access if get_quota_realm return ERR_PTR
  ceph: remove duplicated code in ceph_netfs_issue_read()
  ceph: send oldest_client_tid when renewing caps
  ceph: rename create_session_open_msg() to create_session_full_msg()
  ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION
  ceph: fix deadlock or deadcode of misusing dget()
  ceph: try to allocate a smaller extent map for sparse read
  libceph: remove MAX_EXTENTS check for sparse reads
  ceph: reinitialize mds feature bit even when session in open
  ceph: skip reconnecting if MDS is not ready
parents ec2d264a 2a965d1b

fs/ceph/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config CEPH_FS 
	select CRYPTO_AES

	select CRYPTO

	select NETFS_SUPPORT

	select FS_ENCRYPTION_ALGS if FS_ENCRYPTION

	default n

	help

	  Choose Y or M here to include support for mounting the

fs/ceph/addr.c

+5 −3
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) 
	u64 len = subreq->len;

	bool sparse = IS_ENCRYPTED(inode) || ceph_test_mount_opt(fsc, SPARSEREAD);

	u64 off = subreq->start;

	int extent_cnt;



	if (ceph_inode_is_shutdown(inode)) {

		err = -EIO;
@@ -350,8 +351,8 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) 


	req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout, vino,

			off, &len, 0, 1, sparse ? CEPH_OSD_OP_SPARSE_READ : CEPH_OSD_OP_READ,

			CEPH_OSD_FLAG_READ | fsc->client->osdc.client->options->read_from_replica,

			NULL, ci->i_truncate_seq, ci->i_truncate_size, false);

			CEPH_OSD_FLAG_READ, NULL, ci->i_truncate_seq,

			ci->i_truncate_size, false);

	if (IS_ERR(req)) {

		err = PTR_ERR(req);

		req = NULL;
@@ -359,7 +360,8 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq) 
	}



	if (sparse) {

		err = ceph_alloc_sparse_ext_map(&req->r_ops[0]);

		extent_cnt = __ceph_sparse_read_ext_count(inode, len);

		err = ceph_alloc_sparse_ext_map(&req->r_ops[0], extent_cnt);

		if (err)

			goto out;

	}

fs/ceph/caps.c

+3 −6
Original line number Diff line number Diff line
@@ -4887,13 +4887,15 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
			       struct inode *dir,

			       int mds, int drop, int unless)

{

	struct dentry *parent = NULL;

	struct ceph_mds_request_release *rel = *p;

	struct ceph_dentry_info *di = ceph_dentry(dentry);

	struct ceph_client *cl;

	int force = 0;

	int ret;



	/* This shouldn't happen */

	BUG_ON(!dir);



	/*

	 * force an record for the directory caps if we have a dentry lease.

	 * this is racy (can't take i_ceph_lock and d_lock together), but it
@@ -4903,14 +4905,9 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
	spin_lock(&dentry->d_lock);

	if (di->lease_session && di->lease_session->s_mds == mds)

		force = 1;

	if (!dir) {

		parent = dget(dentry->d_parent);

		dir = d_inode(parent);

	}

	spin_unlock(&dentry->d_lock);



	ret = ceph_encode_inode_release(p, dir, mds, drop, unless, force);

	dput(parent);



	cl = ceph_inode_to_client(dir);

	spin_lock(&dentry->d_lock);

fs/ceph/dir.c

+13 −8
Original line number Diff line number Diff line
@@ -1593,10 +1593,12 @@ struct ceph_lease_walk_control { 
	unsigned long dir_lease_ttl;

};



static int __dir_lease_check(const struct dentry *, struct ceph_lease_walk_control *);

static int __dentry_lease_check(const struct dentry *);



static unsigned long

__dentry_leases_walk(struct ceph_mds_client *mdsc,

		     struct ceph_lease_walk_control *lwc,

		     int (*check)(struct dentry*, void*))

		     struct ceph_lease_walk_control *lwc)

{

	struct ceph_dentry_info *di, *tmp;

	struct dentry *dentry, *last = NULL;
@@ -1624,7 +1626,10 @@ __dentry_leases_walk(struct ceph_mds_client *mdsc, 
			goto next;

		}



		ret = check(dentry, lwc);

		if (lwc->dir_lease)

			ret = __dir_lease_check(dentry, lwc);

		else

			ret = __dentry_lease_check(dentry);

		if (ret & TOUCH) {

			/* move it into tail of dir lease list */

			__dentry_dir_lease_touch(mdsc, di);
@@ -1681,7 +1686,7 @@ __dentry_leases_walk(struct ceph_mds_client *mdsc, 
	return freed;

}



static int __dentry_lease_check(struct dentry *dentry, void *arg)

static int __dentry_lease_check(const struct dentry *dentry)

{

	struct ceph_dentry_info *di = ceph_dentry(dentry);

	int ret;
@@ -1696,9 +1701,9 @@ static int __dentry_lease_check(struct dentry *dentry, void *arg) 
	return DELETE;

}



static int __dir_lease_check(struct dentry *dentry, void *arg)

static int __dir_lease_check(const struct dentry *dentry,

			     struct ceph_lease_walk_control *lwc)

{

	struct ceph_lease_walk_control *lwc = arg;

	struct ceph_dentry_info *di = ceph_dentry(dentry);



	int ret = __dir_lease_try_check(dentry);
@@ -1737,7 +1742,7 @@ int ceph_trim_dentries(struct ceph_mds_client *mdsc) 


	lwc.dir_lease = false;

	lwc.nr_to_scan  = CEPH_CAPS_PER_RELEASE * 2;

	freed = __dentry_leases_walk(mdsc, &lwc, __dentry_lease_check);

	freed = __dentry_leases_walk(mdsc, &lwc);

	if (!lwc.nr_to_scan) /* more invalid leases */

		return -EAGAIN;
@@ -1747,7 +1752,7 @@ int ceph_trim_dentries(struct ceph_mds_client *mdsc) 
	lwc.dir_lease = true;

	lwc.expire_dir_lease = freed < count;

	lwc.dir_lease_ttl = mdsc->fsc->mount_options->caps_wanted_delay_max * HZ;

	freed +=__dentry_leases_walk(mdsc, &lwc, __dir_lease_check);

	freed +=__dentry_leases_walk(mdsc, &lwc);

	if (!lwc.nr_to_scan) /* more to check */

		return -EAGAIN;

fs/ceph/export.c

+0 −2
Original line number Diff line number Diff line
@@ -286,8 +286,6 @@ static struct dentry *__snapfh_to_dentry(struct super_block *sb, 
		doutc(cl, "%llx.%llx parent %llx hash %x err=%d", vino.ino,

		      vino.snap, sfh->parent_ino, sfh->hash, err);

	}

	if (IS_ERR(inode))

		return ERR_CAST(inode);

	/* see comments in ceph_get_parent() */

	return unlinked ? d_obtain_root(inode) : d_obtain_alias(inode);

}