libceph: allow setting abort_on_full for rbd (02b2f549) · Commits · 戴 / test

fs/ceph/super.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -530,7 +530,7 @@ static int ceph_show_options(struct seq_file m, struct dentry root)
	seq_putc(m, ',');		seq_putc(m, ',');
	pos = m->count;		pos = m->count;

	ret = ceph_print_client_options(m, fsc->client);		ret = ceph_print_client_options(m, fsc->client, false);
	if (ret)		if (ret)
	return 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 */		opt = NULL; /* fsc->client now owns this */

	fsc->client->extra_mon_dispatch = extra_mon_dispatch;		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) {		if (!fsopt->mds_namespace) {
	ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP,		ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP,

include/linux/ceph/libceph.h

+4 −2

include/linux/ceph/osd_client.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -354,7 +354,6 @@ struct ceph_osd_client {
	struct rb_root linger_map_checks;		struct rb_root linger_map_checks;
	atomic_t num_requests;		atomic_t num_requests;
	atomic_t num_homeless;		atomic_t num_homeless;
	bool abort_on_full; /* abort w/ ENOSPC when full */
	int abort_err;		int abort_err;
	struct delayed_work timeout_work;		struct delayed_work timeout_work;
	struct delayed_work osds_timeout_work;		struct delayed_work osds_timeout_work;

net/ceph/ceph_common.c

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -255,6 +255,7 @@ enum {
	Opt_nocephx_sign_messages,		Opt_nocephx_sign_messages,
	Opt_tcp_nodelay,		Opt_tcp_nodelay,
	Opt_notcp_nodelay,		Opt_notcp_nodelay,
			Opt_abort_on_full,
	};		};

	static match_table_t opt_tokens = {		static match_table_t opt_tokens = {
	@@ -280,6 +281,7 @@ static match_table_t opt_tokens = {
	{Opt_nocephx_sign_messages, "nocephx_sign_messages"},		{Opt_nocephx_sign_messages, "nocephx_sign_messages"},
	{Opt_tcp_nodelay, "tcp_nodelay"},		{Opt_tcp_nodelay, "tcp_nodelay"},
	{Opt_notcp_nodelay, "notcp_nodelay"},		{Opt_notcp_nodelay, "notcp_nodelay"},
			{Opt_abort_on_full, "abort_on_full"},
	{-1, NULL}		{-1, NULL}
	};		};

	@@ -535,6 +537,10 @@ ceph_parse_options(char options, const char dev_name,
	opt->flags &= ~CEPH_OPT_TCP_NODELAY;		opt->flags &= ~CEPH_OPT_TCP_NODELAY;
	break;		break;

			case Opt_abort_on_full:
			opt->flags \|= CEPH_OPT_ABORT_ON_FULL;
			break;

	default:		default:
	BUG_ON(token);		BUG_ON(token);
	}		}
	@@ -549,7 +555,8 @@ out:
	}		}
	EXPORT_SYMBOL(ceph_parse_options);		EXPORT_SYMBOL(ceph_parse_options);

	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)
	{		{
	struct ceph_options *opt = client->options;		struct ceph_options *opt = client->options;
	size_t pos = m->count;		size_t pos = m->count;
	@@ -574,6 +581,8 @@ int ceph_print_client_options(struct seq_file m, struct ceph_client client)
	seq_puts(m, "nocephx_sign_messages,");		seq_puts(m, "nocephx_sign_messages,");
	if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)		if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
	seq_puts(m, "notcp_nodelay,");		seq_puts(m, "notcp_nodelay,");
			if (show_all && (opt->flags & CEPH_OPT_ABORT_ON_FULL))
			seq_puts(m, "abort_on_full,");

	if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)		if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
	seq_printf(m, "mount_timeout=%d,",		seq_printf(m, "mount_timeout=%d,",

net/ceph/debugfs.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -375,7 +375,7 @@ static int client_options_show(struct seq_file s, void p)
	struct ceph_client *client = s->private;		struct ceph_client *client = s->private;
	int ret;		int ret;

	ret = ceph_print_client_options(s, client);		ret = ceph_print_client_options(s, client, true);
	if (ret)		if (ret)
	return ret;		return ret;

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@
	#define CEPH_OPT_NOMSGAUTH (1<<4) /* don't require msg signing feat */		#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_TCP_NODELAY (1<<5) /* TCP_NODELAY on TCP sockets */
	#define CEPH_OPT_NOMSGSIGN (1<<6) /* don't sign msgs */		#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)		#define CEPH_OPT_DEFAULT (CEPH_OPT_TCP_NODELAY)

	@@ -53,7 +54,7 @@ struct ceph_options {
	unsigned long osd_request_timeout; /* jiffies */		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,		* to be compared should go beyond this point,
	* ceph_compare_options() should be updated accordingly		* 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,		const char dev_name, const char dev_name_end,
	int (parse_extra_token)(char c, void *private),		int (parse_extra_token)(char c, void *private),
	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 void ceph_destroy_options(struct ceph_options *opt);
	extern int ceph_compare_options(struct ceph_options *new_opt,		extern int ceph_compare_options(struct ceph_options *new_opt,
	struct ceph_client *client);		struct ceph_client *client);

Admin message