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

Commit 6e19a16e authored by Sage Weil's avatar Sage Weil
Browse files

ceph: clean up mount options, ->show_options() 



Ensure all options are included in /proc/mounts.  Some cleanup.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 1cd3935b

fs/ceph/super.c

+59 −31
Original line number Diff line number Diff line
@@ -110,6 +110,34 @@ static int ceph_syncfs(struct super_block *sb, int wait) 
	return 0;

}



static int default_congestion_kb(void)

{

	int congestion_kb;



	/*

	 * Copied from NFS

	 *

	 * congestion size, scale with available memory.

	 *

	 *  64MB:    8192k

	 * 128MB:   11585k

	 * 256MB:   16384k

	 * 512MB:   23170k

	 *   1GB:   32768k

	 *   2GB:   46340k

	 *   4GB:   65536k

	 *   8GB:   92681k

	 *  16GB:  131072k

	 *

	 * This allows larger machines to have larger/more transfers.

	 * Limit the default to 256M

	 */

	congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);

	if (congestion_kb > 256*1024)

		congestion_kb = 256*1024;



	return congestion_kb;

}



/**

 * ceph_show_options - Show mount options in /proc/mounts
@@ -135,6 +163,33 @@ static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt) 
		seq_puts(m, ",nocrc");

	if (args->flags & CEPH_OPT_NOASYNCREADDIR)

		seq_puts(m, ",noasyncreaddir");



	if (args->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)

		seq_printf(m, ",mount_timeout=%d", args->mount_timeout);

	if (args->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT)

		seq_printf(m, ",osd_idle_ttl=%d", args->osd_idle_ttl);

	if (args->osd_timeout != CEPH_OSD_TIMEOUT_DEFAULT)

		seq_printf(m, ",osdtimeout=%d", args->osd_timeout);

	if (args->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT)

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

			 args->osd_keepalive_timeout);

	if (args->wsize)

		seq_printf(m, ",wsize=%d", args->wsize);

	if (args->rsize != CEPH_MOUNT_RSIZE_DEFAULT)

		seq_printf(m, ",rsize=%d", args->rsize);

	if (args->congestion_kb != default_congestion_kb())

		seq_printf(m, ",write_congestion_kb=%d", args->congestion_kb);

	if (args->caps_wanted_delay_min != CEPH_CAPS_WANTED_DELAY_MIN_DEFAULT)

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

			 args->caps_wanted_delay_min);

	if (args->caps_wanted_delay_max != CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT)

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

			   args->caps_wanted_delay_max);

	if (args->cap_release_safety != CEPH_CAP_RELEASE_SAFETY_DEFAULT)

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

			   args->cap_release_safety);

	if (args->max_readdir != CEPH_MAX_READDIR_DEFAULT)

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

	if (strcmp(args->snapdir_name, CEPH_SNAPDIRNAME_DEFAULT))

		seq_printf(m, ",snapdirname=%s", args->snapdir_name);

	if (args->name)
@@ -158,35 +213,6 @@ static void ceph_inode_init_once(void *foo) 
	inode_init_once(&ci->vfs_inode);

}



static int default_congestion_kb(void)

{

	int congestion_kb;



	/*

	 * Copied from NFS

	 *

	 * congestion size, scale with available memory.

	 *

	 *  64MB:    8192k

	 * 128MB:   11585k

	 * 256MB:   16384k

	 * 512MB:   23170k

	 *   1GB:   32768k

	 *   2GB:   46340k

	 *   4GB:   65536k

	 *   8GB:   92681k

	 *  16GB:  131072k

	 *

	 * This allows larger machines to have larger/more transfers.

	 * Limit the default to 256M

	 */

	congestion_kb = (16*int_sqrt(totalram_pages)) << (PAGE_SHIFT-10);

	if (congestion_kb > 256*1024)

		congestion_kb = 256*1024;



	return congestion_kb;

}



static int __init init_caches(void)

{

	ceph_inode_cachep = kmem_cache_create("ceph_inode_info",
@@ -305,6 +331,7 @@ enum { 
	Opt_osd_idle_ttl,

	Opt_caps_wanted_delay_min,

	Opt_caps_wanted_delay_max,

	Opt_cap_release_safety,

	Opt_readdir_max_entries,

	Opt_congestion_kb,

	Opt_last_int,
@@ -336,6 +363,7 @@ static match_table_t arg_tokens = { 
	{Opt_osd_idle_ttl, "osd_idle_ttl=%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_congestion_kb, "write_congestion_kb=%d"},

	/* int args above */
@@ -385,8 +413,8 @@ static struct ceph_mount_args *parse_mount_args(int flags, char *options, 
	args->caps_wanted_delay_max = CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT;

	args->rsize = CEPH_MOUNT_RSIZE_DEFAULT;

	args->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);

	args->cap_release_safety = CEPH_CAPS_PER_RELEASE * 4;

	args->max_readdir = 1024;

	args->cap_release_safety = CEPH_CAP_RELEASE_SAFETY_DEFAULT;

	args->max_readdir = CEPH_MAX_READDIR_DEFAULT;

	args->congestion_kb = default_congestion_kb();



	/* ip1[:port1][,ip2[:port2]...]:/subdir/in/fs */

fs/ceph/super.h

+10 −9
Original line number Diff line number Diff line
@@ -52,24 +52,24 @@ 


struct ceph_mount_args {

	int sb_flags;

	int flags;

	struct ceph_fsid fsid;

	struct ceph_entity_addr my_addr;

	int num_mon;

	struct ceph_entity_addr *mon_addr;

	int flags;

	int mount_timeout;

	int osd_idle_ttl;

	int caps_wanted_delay_min, caps_wanted_delay_max;

	struct ceph_fsid fsid;

	struct ceph_entity_addr my_addr;

	int osd_timeout;

	int osd_keepalive_timeout;

	int wsize;

	int rsize;            /* 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 size */

	int congestion_kb;      /* max readdir size */

	int osd_timeout;

	int osd_keepalive_timeout;

	char *snapdir_name;   /* default ".snap" */

	char *name;

	char *secret;

	int cap_release_safety;

};



/*
@@ -80,13 +80,13 @@ struct ceph_mount_args { 
#define CEPH_OSD_KEEPALIVE_DEFAULT  5

#define CEPH_OSD_IDLE_TTL_DEFAULT    60

#define CEPH_MOUNT_RSIZE_DEFAULT    (512*1024) /* readahead */

#define CEPH_MAX_READDIR_DEFAULT    1024



#define CEPH_MSG_MAX_FRONT_LEN	(16*1024*1024)

#define CEPH_MSG_MAX_DATA_LEN	(16*1024*1024)



#define CEPH_SNAPDIRNAME_DEFAULT ".snap"

#define CEPH_AUTH_NAME_DEFAULT   "guest"



/*

 * Delay telling the MDS we no longer want caps, in case we reopen

 * the file.  Delay a minimum amount of time, even if we send a cap
@@ -96,6 +96,7 @@ struct ceph_mount_args { 
#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 {