Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae409dc authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: remove unused cap_release_safety mount option 



Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 569dbb88

fs/ceph/super.c

+0 −6
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ enum { 
	Opt_rasize,

	Opt_caps_wanted_delay_min,

	Opt_caps_wanted_delay_max,

	Opt_cap_release_safety,

	Opt_readdir_max_entries,

	Opt_readdir_max_bytes,

	Opt_congestion_kb,
@@ -152,7 +151,6 @@ static match_table_t fsopt_tokens = { 
	{Opt_rasize, "rasize=%d"},

	{Opt_caps_wanted_delay_min, "caps_wanted_delay_min=%d"},

	{Opt_caps_wanted_delay_max, "caps_wanted_delay_max=%d"},

	{Opt_cap_release_safety, "cap_release_safety=%d"},

	{Opt_readdir_max_entries, "readdir_max_entries=%d"},

	{Opt_readdir_max_bytes, "readdir_max_bytes=%d"},

	{Opt_congestion_kb, "write_congestion_kb=%d"},
@@ -402,7 +400,6 @@ static int parse_mount_options(struct ceph_mount_options **pfsopt, 


	fsopt->caps_wanted_delay_min = CEPH_CAPS_WANTED_DELAY_MIN_DEFAULT;

	fsopt->caps_wanted_delay_max = CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT;

	fsopt->cap_release_safety = CEPH_CAP_RELEASE_SAFETY_DEFAULT;

	fsopt->max_readdir = CEPH_MAX_READDIR_DEFAULT;

	fsopt->max_readdir_bytes = CEPH_MAX_READDIR_BYTES_DEFAULT;

	fsopt->congestion_kb = default_congestion_kb();
@@ -520,9 +517,6 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) 
	if (fsopt->caps_wanted_delay_max != CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT)

		seq_printf(m, ",caps_wanted_delay_max=%d",

			   fsopt->caps_wanted_delay_max);

	if (fsopt->cap_release_safety != CEPH_CAP_RELEASE_SAFETY_DEFAULT)

		seq_printf(m, ",cap_release_safety=%d",

			   fsopt->cap_release_safety);

	if (fsopt->max_readdir != CEPH_MAX_READDIR_DEFAULT)

		seq_printf(m, ",readdir_max_entries=%d", fsopt->max_readdir);

	if (fsopt->max_readdir_bytes != CEPH_MAX_READDIR_BYTES_DEFAULT)

fs/ceph/super.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct ceph_mount_options { 
	int rasize;           /* max readahead */

	int congestion_kb;    /* max writeback in flight */

	int caps_wanted_delay_min, caps_wanted_delay_max;

	int cap_release_safety;

	int max_readdir;       /* max readdir result (entires) */

	int max_readdir_bytes; /* max readdir result (bytes) */

include/linux/ceph/libceph.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct ceph_options { 
#define CEPH_CAPS_WANTED_DELAY_MIN_DEFAULT      5  /* cap release delay */

#define CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT     60  /* cap release delay */



#define CEPH_CAP_RELEASE_SAFETY_DEFAULT        (CEPH_CAPS_PER_RELEASE * 4)



/* mount state */

enum {