ceph: move readahead default to fs/ceph from libceph
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
ad1fee96cb
commit
80456f8672
|
@ -293,7 +293,7 @@ static int parse_mount_options(struct ceph_mount_options **pfsopt,
|
||||||
fsopt->sb_flags = flags;
|
fsopt->sb_flags = flags;
|
||||||
fsopt->flags = CEPH_MOUNT_OPT_DEFAULT;
|
fsopt->flags = CEPH_MOUNT_OPT_DEFAULT;
|
||||||
|
|
||||||
fsopt->rsize = CEPH_MOUNT_RSIZE_DEFAULT;
|
fsopt->rsize = CEPH_RSIZE_DEFAULT;
|
||||||
fsopt->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);
|
fsopt->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);
|
||||||
fsopt->caps_wanted_delay_min = CEPH_CAPS_WANTED_DELAY_MIN_DEFAULT;
|
fsopt->caps_wanted_delay_min = CEPH_CAPS_WANTED_DELAY_MIN_DEFAULT;
|
||||||
fsopt->caps_wanted_delay_max = CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT;
|
fsopt->caps_wanted_delay_max = CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT;
|
||||||
|
@ -375,7 +375,7 @@ static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt)
|
||||||
|
|
||||||
if (fsopt->wsize)
|
if (fsopt->wsize)
|
||||||
seq_printf(m, ",wsize=%d", fsopt->wsize);
|
seq_printf(m, ",wsize=%d", fsopt->wsize);
|
||||||
if (fsopt->rsize != CEPH_MOUNT_RSIZE_DEFAULT)
|
if (fsopt->rsize != CEPH_RSIZE_DEFAULT)
|
||||||
seq_printf(m, ",rsize=%d", fsopt->rsize);
|
seq_printf(m, ",rsize=%d", fsopt->rsize);
|
||||||
if (fsopt->congestion_kb != default_congestion_kb())
|
if (fsopt->congestion_kb != default_congestion_kb())
|
||||||
seq_printf(m, ",write_congestion_kb=%d", fsopt->congestion_kb);
|
seq_printf(m, ",write_congestion_kb=%d", fsopt->congestion_kb);
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#define ceph_test_mount_opt(fsc, opt) \
|
#define ceph_test_mount_opt(fsc, opt) \
|
||||||
(!!((fsc)->mount_options->flags & CEPH_MOUNT_OPT_##opt))
|
(!!((fsc)->mount_options->flags & CEPH_MOUNT_OPT_##opt))
|
||||||
|
|
||||||
|
#define CEPH_RSIZE_DEFAULT (512*1024) /* readahead */
|
||||||
#define CEPH_MAX_READDIR_DEFAULT 1024
|
#define CEPH_MAX_READDIR_DEFAULT 1024
|
||||||
#define CEPH_MAX_READDIR_BYTES_DEFAULT (512*1024)
|
#define CEPH_MAX_READDIR_BYTES_DEFAULT (512*1024)
|
||||||
#define CEPH_SNAPDIRNAME_DEFAULT ".snap"
|
#define CEPH_SNAPDIRNAME_DEFAULT ".snap"
|
||||||
|
|
|
@ -71,7 +71,6 @@ struct ceph_options {
|
||||||
#define CEPH_OSD_TIMEOUT_DEFAULT 60 /* seconds */
|
#define CEPH_OSD_TIMEOUT_DEFAULT 60 /* seconds */
|
||||||
#define CEPH_OSD_KEEPALIVE_DEFAULT 5
|
#define CEPH_OSD_KEEPALIVE_DEFAULT 5
|
||||||
#define CEPH_OSD_IDLE_TTL_DEFAULT 60
|
#define CEPH_OSD_IDLE_TTL_DEFAULT 60
|
||||||
#define CEPH_MOUNT_RSIZE_DEFAULT (512*1024) /* readahead */
|
|
||||||
|
|
||||||
#define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024)
|
#define CEPH_MSG_MAX_FRONT_LEN (16*1024*1024)
|
||||||
#define CEPH_MSG_MAX_DATA_LEN (16*1024*1024)
|
#define CEPH_MSG_MAX_DATA_LEN (16*1024*1024)
|
||||||
|
|
Loading…
Reference in New Issue