diff options
| author | Ilya Dryomov | 2013-12-30 18:21:29 +0100 |
|---|---|---|
| committer | Ilya Dryomov | 2013-12-31 19:32:30 +0100 |
| commit | f48db1e9ac6f1578ab7efef9f66c70279e2f0cb5 (patch) | |
| tree | 3c6a017262e228c2346cc1233326ad58868a07a5 /net/ceph | |
| parent | crush: support new indep mode and SET_* steps (crush v2) by default (diff) | |
| download | kernel-qcow2-linux-f48db1e9ac6f1578ab7efef9f66c70279e2f0cb5.tar.gz kernel-qcow2-linux-f48db1e9ac6f1578ab7efef9f66c70279e2f0cb5.tar.xz kernel-qcow2-linux-f48db1e9ac6f1578ab7efef9f66c70279e2f0cb5.zip | |
libceph: use CEPH_MON_PORT when the specified port is 0
Similar to userspace, don't bail with "parse_ips bad ip ..." if the
specified port is port 0, instead use port CEPH_MON_PORT (6789, the
default monitor port).
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index bd172e1ee0ae..d2cadb5b2b63 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1866,7 +1866,9 @@ int ceph_parse_ips(const char *c, const char *end, port = (port * 10) + (*p - '0'); p++; } - if (port > 65535 || port == 0) + if (port == 0) + port = CEPH_MON_PORT; + else if (port > 65535) goto bad; } else { port = CEPH_MON_PORT; |