mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
ceph: clean up mount options, ->show_options()
Ensure all options are included in /proc/mounts. Some cleanup. Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
1cd3935bed
commit
6e19a16ef2
2 changed files with 90 additions and 61 deletions
128
fs/ceph/super.c
128
fs/ceph/super.c
|
@ -110,54 +110,6 @@ static int ceph_syncfs(struct super_block *sb, int wait)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ceph_show_options - Show mount options in /proc/mounts
|
|
||||||
* @m: seq_file to write to
|
|
||||||
* @mnt: mount descriptor
|
|
||||||
*/
|
|
||||||
static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt)
|
|
||||||
{
|
|
||||||
struct ceph_client *client = ceph_sb_to_client(mnt->mnt_sb);
|
|
||||||
struct ceph_mount_args *args = client->mount_args;
|
|
||||||
|
|
||||||
if (args->flags & CEPH_OPT_FSID)
|
|
||||||
seq_printf(m, ",fsidmajor=%llu,fsidminor%llu",
|
|
||||||
le64_to_cpu(*(__le64 *)&args->fsid.fsid[0]),
|
|
||||||
le64_to_cpu(*(__le64 *)&args->fsid.fsid[8]));
|
|
||||||
if (args->flags & CEPH_OPT_NOSHARE)
|
|
||||||
seq_puts(m, ",noshare");
|
|
||||||
if (args->flags & CEPH_OPT_DIRSTAT)
|
|
||||||
seq_puts(m, ",dirstat");
|
|
||||||
if ((args->flags & CEPH_OPT_RBYTES) == 0)
|
|
||||||
seq_puts(m, ",norbytes");
|
|
||||||
if (args->flags & CEPH_OPT_NOCRC)
|
|
||||||
seq_puts(m, ",nocrc");
|
|
||||||
if (args->flags & CEPH_OPT_NOASYNCREADDIR)
|
|
||||||
seq_puts(m, ",noasyncreaddir");
|
|
||||||
if (strcmp(args->snapdir_name, CEPH_SNAPDIRNAME_DEFAULT))
|
|
||||||
seq_printf(m, ",snapdirname=%s", args->snapdir_name);
|
|
||||||
if (args->name)
|
|
||||||
seq_printf(m, ",name=%s", args->name);
|
|
||||||
if (args->secret)
|
|
||||||
seq_puts(m, ",secret=<hidden>");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* caches
|
|
||||||
*/
|
|
||||||
struct kmem_cache *ceph_inode_cachep;
|
|
||||||
struct kmem_cache *ceph_cap_cachep;
|
|
||||||
struct kmem_cache *ceph_dentry_cachep;
|
|
||||||
struct kmem_cache *ceph_file_cachep;
|
|
||||||
|
|
||||||
static void ceph_inode_init_once(void *foo)
|
|
||||||
{
|
|
||||||
struct ceph_inode_info *ci = foo;
|
|
||||||
inode_init_once(&ci->vfs_inode);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int default_congestion_kb(void)
|
static int default_congestion_kb(void)
|
||||||
{
|
{
|
||||||
int congestion_kb;
|
int congestion_kb;
|
||||||
|
@ -187,6 +139,80 @@ static int default_congestion_kb(void)
|
||||||
return congestion_kb;
|
return congestion_kb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ceph_show_options - Show mount options in /proc/mounts
|
||||||
|
* @m: seq_file to write to
|
||||||
|
* @mnt: mount descriptor
|
||||||
|
*/
|
||||||
|
static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt)
|
||||||
|
{
|
||||||
|
struct ceph_client *client = ceph_sb_to_client(mnt->mnt_sb);
|
||||||
|
struct ceph_mount_args *args = client->mount_args;
|
||||||
|
|
||||||
|
if (args->flags & CEPH_OPT_FSID)
|
||||||
|
seq_printf(m, ",fsidmajor=%llu,fsidminor%llu",
|
||||||
|
le64_to_cpu(*(__le64 *)&args->fsid.fsid[0]),
|
||||||
|
le64_to_cpu(*(__le64 *)&args->fsid.fsid[8]));
|
||||||
|
if (args->flags & CEPH_OPT_NOSHARE)
|
||||||
|
seq_puts(m, ",noshare");
|
||||||
|
if (args->flags & CEPH_OPT_DIRSTAT)
|
||||||
|
seq_puts(m, ",dirstat");
|
||||||
|
if ((args->flags & CEPH_OPT_RBYTES) == 0)
|
||||||
|
seq_puts(m, ",norbytes");
|
||||||
|
if (args->flags & CEPH_OPT_NOCRC)
|
||||||
|
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)
|
||||||
|
seq_printf(m, ",name=%s", args->name);
|
||||||
|
if (args->secret)
|
||||||
|
seq_puts(m, ",secret=<hidden>");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* caches
|
||||||
|
*/
|
||||||
|
struct kmem_cache *ceph_inode_cachep;
|
||||||
|
struct kmem_cache *ceph_cap_cachep;
|
||||||
|
struct kmem_cache *ceph_dentry_cachep;
|
||||||
|
struct kmem_cache *ceph_file_cachep;
|
||||||
|
|
||||||
|
static void ceph_inode_init_once(void *foo)
|
||||||
|
{
|
||||||
|
struct ceph_inode_info *ci = foo;
|
||||||
|
inode_init_once(&ci->vfs_inode);
|
||||||
|
}
|
||||||
|
|
||||||
static int __init init_caches(void)
|
static int __init init_caches(void)
|
||||||
{
|
{
|
||||||
ceph_inode_cachep = kmem_cache_create("ceph_inode_info",
|
ceph_inode_cachep = kmem_cache_create("ceph_inode_info",
|
||||||
|
@ -305,6 +331,7 @@ enum {
|
||||||
Opt_osd_idle_ttl,
|
Opt_osd_idle_ttl,
|
||||||
Opt_caps_wanted_delay_min,
|
Opt_caps_wanted_delay_min,
|
||||||
Opt_caps_wanted_delay_max,
|
Opt_caps_wanted_delay_max,
|
||||||
|
Opt_cap_release_safety,
|
||||||
Opt_readdir_max_entries,
|
Opt_readdir_max_entries,
|
||||||
Opt_congestion_kb,
|
Opt_congestion_kb,
|
||||||
Opt_last_int,
|
Opt_last_int,
|
||||||
|
@ -336,6 +363,7 @@ static match_table_t arg_tokens = {
|
||||||
{Opt_osd_idle_ttl, "osd_idle_ttl=%d"},
|
{Opt_osd_idle_ttl, "osd_idle_ttl=%d"},
|
||||||
{Opt_caps_wanted_delay_min, "caps_wanted_delay_min=%d"},
|
{Opt_caps_wanted_delay_min, "caps_wanted_delay_min=%d"},
|
||||||
{Opt_caps_wanted_delay_max, "caps_wanted_delay_max=%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_entries, "readdir_max_entries=%d"},
|
||||||
{Opt_congestion_kb, "write_congestion_kb=%d"},
|
{Opt_congestion_kb, "write_congestion_kb=%d"},
|
||||||
/* int args above */
|
/* 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->caps_wanted_delay_max = CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT;
|
||||||
args->rsize = CEPH_MOUNT_RSIZE_DEFAULT;
|
args->rsize = CEPH_MOUNT_RSIZE_DEFAULT;
|
||||||
args->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);
|
args->snapdir_name = kstrdup(CEPH_SNAPDIRNAME_DEFAULT, GFP_KERNEL);
|
||||||
args->cap_release_safety = CEPH_CAPS_PER_RELEASE * 4;
|
args->cap_release_safety = CEPH_CAP_RELEASE_SAFETY_DEFAULT;
|
||||||
args->max_readdir = 1024;
|
args->max_readdir = CEPH_MAX_READDIR_DEFAULT;
|
||||||
args->congestion_kb = default_congestion_kb();
|
args->congestion_kb = default_congestion_kb();
|
||||||
|
|
||||||
/* ip1[:port1][,ip2[:port2]...]:/subdir/in/fs */
|
/* ip1[:port1][,ip2[:port2]...]:/subdir/in/fs */
|
||||||
|
|
|
@ -52,24 +52,24 @@
|
||||||
|
|
||||||
struct ceph_mount_args {
|
struct ceph_mount_args {
|
||||||
int sb_flags;
|
int sb_flags;
|
||||||
int num_mon;
|
|
||||||
struct ceph_entity_addr *mon_addr;
|
|
||||||
int flags;
|
int flags;
|
||||||
int mount_timeout;
|
|
||||||
int osd_idle_ttl;
|
|
||||||
int caps_wanted_delay_min, caps_wanted_delay_max;
|
|
||||||
struct ceph_fsid fsid;
|
struct ceph_fsid fsid;
|
||||||
struct ceph_entity_addr my_addr;
|
struct ceph_entity_addr my_addr;
|
||||||
int wsize;
|
int num_mon;
|
||||||
int rsize; /* max readahead */
|
struct ceph_entity_addr *mon_addr;
|
||||||
int max_readdir; /* max readdir size */
|
int mount_timeout;
|
||||||
int congestion_kb; /* max readdir size */
|
int osd_idle_ttl;
|
||||||
int osd_timeout;
|
int osd_timeout;
|
||||||
int osd_keepalive_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 */
|
||||||
char *snapdir_name; /* default ".snap" */
|
char *snapdir_name; /* default ".snap" */
|
||||||
char *name;
|
char *name;
|
||||||
char *secret;
|
char *secret;
|
||||||
int cap_release_safety;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -80,13 +80,13 @@ struct ceph_mount_args {
|
||||||
#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_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_FRONT_LEN (16*1024*1024)
|
||||||
#define CEPH_MSG_MAX_DATA_LEN (16*1024*1024)
|
#define CEPH_MSG_MAX_DATA_LEN (16*1024*1024)
|
||||||
|
|
||||||
#define CEPH_SNAPDIRNAME_DEFAULT ".snap"
|
#define CEPH_SNAPDIRNAME_DEFAULT ".snap"
|
||||||
#define CEPH_AUTH_NAME_DEFAULT "guest"
|
#define CEPH_AUTH_NAME_DEFAULT "guest"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Delay telling the MDS we no longer want caps, in case we reopen
|
* 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
|
* 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_MIN_DEFAULT 5 /* cap release delay */
|
||||||
#define CEPH_CAPS_WANTED_DELAY_MAX_DEFAULT 60 /* 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 */
|
/* mount state */
|
||||||
enum {
|
enum {
|
||||||
|
|
Loading…
Reference in a new issue