efivarfs: Move efivar availability check into FS context init
Instead of checking whether or not EFI variables are available when creating the superblock, check it one step earlier, when initializing the FS context for the mount. This way, no FS context will be created at all, and we can drop the second check at .kill_sb() time entirely. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
parent
0e8d244416
commit
d28076ddda
@ -296,9 +296,6 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)
|
||||
struct dentry *root;
|
||||
int err;
|
||||
|
||||
if (!efivar_is_available())
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
sb->s_maxbytes = MAX_LFS_FILESIZE;
|
||||
sb->s_blocksize = PAGE_SIZE;
|
||||
sb->s_blocksize_bits = PAGE_SHIFT;
|
||||
@ -354,6 +351,9 @@ static int efivarfs_init_fs_context(struct fs_context *fc)
|
||||
{
|
||||
struct efivarfs_fs_info *sfi;
|
||||
|
||||
if (!efivar_is_available())
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
sfi = kzalloc(sizeof(*sfi), GFP_KERNEL);
|
||||
if (!sfi)
|
||||
return -ENOMEM;
|
||||
@ -370,9 +370,6 @@ static void efivarfs_kill_sb(struct super_block *sb)
|
||||
{
|
||||
kill_litter_super(sb);
|
||||
|
||||
if (!efivar_is_available())
|
||||
return;
|
||||
|
||||
/* Remove all entries and destroy */
|
||||
efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user