efivarfs: Move efivar availability check into FS context init

[linux-2.6-microblaze.git] / fs / efivarfs / super.c

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 869537f..d4530e4 100644 (file)
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -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);
 }