Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / efivarfs / super.c

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index 15880a68faadc58ba34d1a3f68ac412416202f2e..6780fc81cc11f0d22a4636cfb09b24370563df5a 100644 (file)
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -155,10 +155,8 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor,
                goto fail_inode;
        }
 
-       efivar_entry_size(entry, &size);
-       err = efivar_entry_add(entry, &efivarfs_list);
-       if (err)
-               goto fail_inode;
+       __efivar_entry_get(entry, NULL, &size, NULL);
+       __efivar_entry_add(entry, &efivarfs_list);
 
        /* copied by the above to local storage in the dentry. */
        kfree(name);
@@ -182,10 +180,7 @@ fail:
 
 static int efivarfs_destroy(struct efivar_entry *entry, void *data)
 {
-       int err = efivar_entry_remove(entry);
-
-       if (err)
-               return err;
+       efivar_entry_remove(entry);
        kfree(entry);
        return 0;
 }
@@ -221,7 +216,7 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)
 
        err = efivar_init(efivarfs_callback, (void *)sb, true, &efivarfs_list);
        if (err)
-               __efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL, NULL);
+               efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL);
 
        return err;
 }
@@ -246,7 +241,7 @@ static void efivarfs_kill_sb(struct super_block *sb)
        kill_litter_super(sb);
 
        /* Remove all entries and destroy */
-       __efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL, NULL);
+       efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL);
 }
 
 static struct file_system_type efivarfs_type = {