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

Merge tag 'ceph-for-5.0-rc2' of git://github.com/ceph/ceph-client 

Pull ceph updates from Ilya Dryomov:
 "A patch to allow setting abort_on_full and a fix for an old "rbd
  unmap" edge case, marked for stable"

* tag 'ceph-for-5.0-rc2' of git://github.com/ceph/ceph-client:
  rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set
  ceph: use vmf_error() in ceph_filemap_fault()
  libceph: allow setting abort_on_full for rbd
parents 40a31da4 85f5a4d6

drivers/block/rbd.c

+4 −5
Original line number Diff line number Diff line
@@ -5986,7 +5986,6 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
	struct list_head *tmp;

	int dev_id;

	char opt_buf[6];

	bool already = false;

	bool force = false;

	int ret;
@@ -6019,13 +6018,13 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
		spin_lock_irq(&rbd_dev->lock);

		if (rbd_dev->open_count && !force)

			ret = -EBUSY;

		else

			already = test_and_set_bit(RBD_DEV_FLAG_REMOVING,

							&rbd_dev->flags);

		else if (test_and_set_bit(RBD_DEV_FLAG_REMOVING,

					  &rbd_dev->flags))

			ret = -EINPROGRESS;

		spin_unlock_irq(&rbd_dev->lock);

	}

	spin_unlock(&rbd_dev_list_lock);

	if (ret < 0 || already)

	if (ret)

		return ret;



	if (force) {

fs/ceph/addr.c

+1 −4
Original line number Diff line number Diff line
@@ -1494,10 +1494,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) 
		if (err < 0 || off >= i_size_read(inode)) {

			unlock_page(page);

			put_page(page);

			if (err == -ENOMEM)

				ret = VM_FAULT_OOM;

			else

				ret = VM_FAULT_SIGBUS;

			ret = vmf_error(err);

			goto out_inline;

		}

		if (err < PAGE_SIZE)

fs/ceph/super.c

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) 
	seq_putc(m, ',');

	pos = m->count;



	ret = ceph_print_client_options(m, fsc->client);

	ret = ceph_print_client_options(m, fsc->client, false);

	if (ret)

		return ret;
@@ -640,7 +640,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt, 
	opt = NULL; /* fsc->client now owns this */



	fsc->client->extra_mon_dispatch = extra_mon_dispatch;

	fsc->client->osdc.abort_on_full = true;

	ceph_set_opt(fsc->client, ABORT_ON_FULL);



	if (!fsopt->mds_namespace) {

		ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP,

include/linux/ceph/libceph.h

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define CEPH_OPT_NOMSGAUTH	  (1<<4) /* don't require msg signing feat */

#define CEPH_OPT_TCP_NODELAY	  (1<<5) /* TCP_NODELAY on TCP sockets */

#define CEPH_OPT_NOMSGSIGN	  (1<<6) /* don't sign msgs */

#define CEPH_OPT_ABORT_ON_FULL	  (1<<7) /* abort w/ ENOSPC when full */



#define CEPH_OPT_DEFAULT   (CEPH_OPT_TCP_NODELAY)
@@ -53,7 +54,7 @@ struct ceph_options { 
	unsigned long osd_request_timeout;	/* jiffies */



	/*

	 * any type that can't be simply compared or doesn't need need

	 * any type that can't be simply compared or doesn't need

	 * to be compared should go beyond this point,

	 * ceph_compare_options() should be updated accordingly

	 */
@@ -281,7 +282,8 @@ extern struct ceph_options *ceph_parse_options(char *options, 
			      const char *dev_name, const char *dev_name_end,

			      int (*parse_extra_token)(char *c, void *private),

			      void *private);

int ceph_print_client_options(struct seq_file *m, struct ceph_client *client);

int ceph_print_client_options(struct seq_file *m, struct ceph_client *client,

			      bool show_all);

extern void ceph_destroy_options(struct ceph_options *opt);

extern int ceph_compare_options(struct ceph_options *new_opt,

				struct ceph_client *client);

include/linux/ceph/osd_client.h

+0 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ struct ceph_osd_client { 
	struct rb_root         linger_map_checks;

	atomic_t               num_requests;

	atomic_t               num_homeless;

	bool                   abort_on_full; /* abort w/ ENOSPC when full */

	int                    abort_err;

	struct delayed_work    timeout_work;

	struct delayed_work    osds_timeout_work;

CRA Git | Maintained and supported by SUSTech CRA and CCSE