diff options
Diffstat (limited to 'net/ceph/ceph_common.c')
| -rw-r--r-- | net/ceph/ceph_common.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 87afb9ec4c68..9cab80207ced 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c | |||
| @@ -255,6 +255,7 @@ enum { | |||
| 255 | Opt_nocephx_sign_messages, | 255 | Opt_nocephx_sign_messages, |
| 256 | Opt_tcp_nodelay, | 256 | Opt_tcp_nodelay, |
| 257 | Opt_notcp_nodelay, | 257 | Opt_notcp_nodelay, |
| 258 | Opt_abort_on_full, | ||
| 258 | }; | 259 | }; |
| 259 | 260 | ||
| 260 | static match_table_t opt_tokens = { | 261 | static match_table_t opt_tokens = { |
| @@ -280,6 +281,7 @@ static match_table_t opt_tokens = { | |||
| 280 | {Opt_nocephx_sign_messages, "nocephx_sign_messages"}, | 281 | {Opt_nocephx_sign_messages, "nocephx_sign_messages"}, |
| 281 | {Opt_tcp_nodelay, "tcp_nodelay"}, | 282 | {Opt_tcp_nodelay, "tcp_nodelay"}, |
| 282 | {Opt_notcp_nodelay, "notcp_nodelay"}, | 283 | {Opt_notcp_nodelay, "notcp_nodelay"}, |
| 284 | {Opt_abort_on_full, "abort_on_full"}, | ||
| 283 | {-1, NULL} | 285 | {-1, NULL} |
| 284 | }; | 286 | }; |
| 285 | 287 | ||
| @@ -535,6 +537,10 @@ ceph_parse_options(char *options, const char *dev_name, | |||
| 535 | opt->flags &= ~CEPH_OPT_TCP_NODELAY; | 537 | opt->flags &= ~CEPH_OPT_TCP_NODELAY; |
| 536 | break; | 538 | break; |
| 537 | 539 | ||
| 540 | case Opt_abort_on_full: | ||
| 541 | opt->flags |= CEPH_OPT_ABORT_ON_FULL; | ||
| 542 | break; | ||
| 543 | |||
| 538 | default: | 544 | default: |
| 539 | BUG_ON(token); | 545 | BUG_ON(token); |
| 540 | } | 546 | } |
| @@ -549,7 +555,8 @@ out: | |||
| 549 | } | 555 | } |
| 550 | EXPORT_SYMBOL(ceph_parse_options); | 556 | EXPORT_SYMBOL(ceph_parse_options); |
| 551 | 557 | ||
| 552 | int ceph_print_client_options(struct seq_file *m, struct ceph_client *client) | 558 | int ceph_print_client_options(struct seq_file *m, struct ceph_client *client, |
| 559 | bool show_all) | ||
| 553 | { | 560 | { |
| 554 | struct ceph_options *opt = client->options; | 561 | struct ceph_options *opt = client->options; |
| 555 | size_t pos = m->count; | 562 | size_t pos = m->count; |
| @@ -574,6 +581,8 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client) | |||
| 574 | seq_puts(m, "nocephx_sign_messages,"); | 581 | seq_puts(m, "nocephx_sign_messages,"); |
| 575 | if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0) | 582 | if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0) |
| 576 | seq_puts(m, "notcp_nodelay,"); | 583 | seq_puts(m, "notcp_nodelay,"); |
| 584 | if (show_all && (opt->flags & CEPH_OPT_ABORT_ON_FULL)) | ||
| 585 | seq_puts(m, "abort_on_full,"); | ||
| 577 | 586 | ||
| 578 | if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT) | 587 | if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT) |
| 579 | seq_printf(m, "mount_timeout=%d,", | 588 | seq_printf(m, "mount_timeout=%d,", |
