diff options
Diffstat (limited to 'include/linux/ceph/libceph.h')
| -rw-r--r-- | include/linux/ceph/libceph.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 3e3799cdc6e6..e7975e4681e1 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h | |||
| @@ -47,7 +47,6 @@ struct ceph_options { | |||
| 47 | unsigned long mount_timeout; /* jiffies */ | 47 | unsigned long mount_timeout; /* jiffies */ |
| 48 | unsigned long osd_idle_ttl; /* jiffies */ | 48 | unsigned long osd_idle_ttl; /* jiffies */ |
| 49 | unsigned long osd_keepalive_timeout; /* jiffies */ | 49 | unsigned long osd_keepalive_timeout; /* jiffies */ |
| 50 | unsigned long monc_ping_timeout; /* jiffies */ | ||
| 51 | 50 | ||
| 52 | /* | 51 | /* |
| 53 | * any type that can't be simply compared or doesn't need need | 52 | * any type that can't be simply compared or doesn't need need |
| @@ -68,7 +67,12 @@ struct ceph_options { | |||
| 68 | #define CEPH_MOUNT_TIMEOUT_DEFAULT msecs_to_jiffies(60 * 1000) | 67 | #define CEPH_MOUNT_TIMEOUT_DEFAULT msecs_to_jiffies(60 * 1000) |
| 69 | #define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000) | 68 | #define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000) |
| 70 | #define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000) | 69 | #define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000) |
| 71 | #define CEPH_MONC_PING_TIMEOUT_DEFAULT msecs_to_jiffies(30 * 1000) | 70 | |
| 71 | #define CEPH_MONC_HUNT_INTERVAL msecs_to_jiffies(3 * 1000) | ||
| 72 | #define CEPH_MONC_PING_INTERVAL msecs_to_jiffies(10 * 1000) | ||
| 73 | #define CEPH_MONC_PING_TIMEOUT msecs_to_jiffies(30 * 1000) | ||
| 74 | #define CEPH_MONC_HUNT_BACKOFF 2 | ||
| 75 | #define CEPH_MONC_HUNT_MAX_MULT 10 | ||
| 72 | 76 | ||
| 73 | #define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024) | 77 | #define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024) |
| 74 | #define CEPH_MSG_MAX_MIDDLE_LEN (16*1024*1024) | 78 | #define CEPH_MSG_MAX_MIDDLE_LEN (16*1024*1024) |
