mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
autofs: refactor super block info init
Move the allocation and initialisation of the super block info struct to its own function. Signed-off-by: Ian Kent <raven@themaw.net> Reviewed-by: Bill O'Donnell <bodonnel@redhat.com> Message-Id: <20230922041215.13675-4-raven@themaw.net> Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
546694b8f6
commit
a7467430b4
1 changed files with 28 additions and 25 deletions
|
@ -171,11 +171,6 @@ static int parse_options(char *options,
|
|||
root->i_uid = current_uid();
|
||||
root->i_gid = current_gid();
|
||||
|
||||
sbi->min_proto = AUTOFS_MIN_PROTO_VERSION;
|
||||
sbi->max_proto = AUTOFS_MAX_PROTO_VERSION;
|
||||
|
||||
sbi->pipefd = -1;
|
||||
|
||||
if (!options)
|
||||
return 1;
|
||||
|
||||
|
@ -248,6 +243,31 @@ static int parse_options(char *options,
|
|||
return (sbi->pipefd < 0);
|
||||
}
|
||||
|
||||
static struct autofs_sb_info *autofs_alloc_sbi(void)
|
||||
{
|
||||
struct autofs_sb_info *sbi;
|
||||
|
||||
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
|
||||
if (!sbi)
|
||||
return NULL;
|
||||
|
||||
sbi->magic = AUTOFS_SBI_MAGIC;
|
||||
sbi->flags = AUTOFS_SBI_CATATONIC;
|
||||
sbi->min_proto = AUTOFS_MIN_PROTO_VERSION;
|
||||
sbi->max_proto = AUTOFS_MAX_PROTO_VERSION;
|
||||
sbi->pipefd = -1;
|
||||
|
||||
set_autofs_type_indirect(&sbi->type);
|
||||
mutex_init(&sbi->wq_mutex);
|
||||
mutex_init(&sbi->pipe_mutex);
|
||||
spin_lock_init(&sbi->fs_lock);
|
||||
spin_lock_init(&sbi->lookup_lock);
|
||||
INIT_LIST_HEAD(&sbi->active_list);
|
||||
INIT_LIST_HEAD(&sbi->expiring_list);
|
||||
|
||||
return sbi;
|
||||
}
|
||||
|
||||
int autofs_fill_super(struct super_block *s, void *data, int silent)
|
||||
{
|
||||
struct inode *root_inode;
|
||||
|
@ -258,31 +278,14 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
|
|||
bool pgrp_set = false;
|
||||
int ret = -EINVAL;
|
||||
|
||||
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
|
||||
sbi = autofs_alloc_sbi();
|
||||
if (!sbi)
|
||||
return -ENOMEM;
|
||||
|
||||
pr_debug("starting up, sbi = %p\n", sbi);
|
||||
|
||||
s->s_fs_info = sbi;
|
||||
sbi->magic = AUTOFS_SBI_MAGIC;
|
||||
sbi->pipefd = -1;
|
||||
sbi->pipe = NULL;
|
||||
sbi->exp_timeout = 0;
|
||||
sbi->oz_pgrp = NULL;
|
||||
sbi->sb = s;
|
||||
sbi->version = 0;
|
||||
sbi->sub_version = 0;
|
||||
sbi->flags = AUTOFS_SBI_CATATONIC;
|
||||
set_autofs_type_indirect(&sbi->type);
|
||||
sbi->min_proto = 0;
|
||||
sbi->max_proto = 0;
|
||||
mutex_init(&sbi->wq_mutex);
|
||||
mutex_init(&sbi->pipe_mutex);
|
||||
spin_lock_init(&sbi->fs_lock);
|
||||
sbi->queues = NULL;
|
||||
spin_lock_init(&sbi->lookup_lock);
|
||||
INIT_LIST_HEAD(&sbi->active_list);
|
||||
INIT_LIST_HEAD(&sbi->expiring_list);
|
||||
s->s_fs_info = sbi;
|
||||
s->s_blocksize = 1024;
|
||||
s->s_blocksize_bits = 10;
|
||||
s->s_magic = AUTOFS_SUPER_MAGIC;
|
||||
|
|
Loading…
Add table
Reference in a new issue