Commit a7467430 authored by Ian Kent's avatar Ian Kent Committed by Christian Brauner
Browse files

autofs: refactor super block info init 



Move the allocation and initialisation of the super block
info struct to its own function.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Reviewed-by: default avatarBill O'Donnell <bodonnel@redhat.com>
Message-Id: <20230922041215.13675-4-raven@themaw.net>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 546694b8

fs/autofs/inode.c

+28 −25
Original line number Diff line number Diff line
@@ -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,41 +243,49 @@ static int parse_options(char *options, 
	return (sbi->pipefd < 0);

}



int autofs_fill_super(struct super_block *s, void *data, int silent)

static struct autofs_sb_info *autofs_alloc_sbi(void)

{

	struct inode *root_inode;

	struct dentry *root;

	struct autofs_sb_info *sbi;

	struct autofs_info *ino;

	int pgrp = 0;

	bool pgrp_set = false;

	int ret = -EINVAL;



	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);

	if (!sbi)

		return -ENOMEM;

	pr_debug("starting up, sbi = %p\n", sbi);

		return NULL;



	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;

	sbi->min_proto = AUTOFS_MIN_PROTO_VERSION;

	sbi->max_proto = AUTOFS_MAX_PROTO_VERSION;

	sbi->pipefd = -1;



	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);



	return sbi;

}



int autofs_fill_super(struct super_block *s, void *data, int silent)

{

	struct inode *root_inode;

	struct dentry *root;

	struct autofs_sb_info *sbi;

	struct autofs_info *ino;

	int pgrp = 0;

	bool pgrp_set = false;

	int ret = -EINVAL;



	sbi = autofs_alloc_sbi();

	if (!sbi)

		return -ENOMEM;



	pr_debug("starting up, sbi = %p\n", sbi);



	sbi->sb = s;

	s->s_fs_info = sbi;

	s->s_blocksize = 1024;

	s->s_blocksize_bits = 10;

	s->s_magic = AUTOFS_SUPER_MAGIC;