Commit c57b6e1d authored by James Bottomley's avatar James Bottomley Committed by Ard Biesheuvel
Browse files

efivarfs: remove unused efi_variable.Attributes and efivar_entry.kobj 



These fields look to be remnants of older code: Attributes was likely
meant to stash the variable attributes, but doesn't because we always
read them from the variable store and kobj was likely left over from
an older iteration of code where we manually created the objects
instead of using a filesystem.

[ ardb: these fields were used by the sysfs based 'efivars' precursor to
	efivarfs, which was removed in commit 0f5b2c69 ("efi: vars:
	Remove deprecated 'efivars' sysfs interface") ]

Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 78d4f34e

fs/efivarfs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -24,13 +24,11 @@ struct efivarfs_fs_info { 
struct efi_variable {

	efi_char16_t  VariableName[EFI_VAR_NAME_LEN/sizeof(efi_char16_t)];

	efi_guid_t    VendorGuid;

	__u32         Attributes;

};



struct efivar_entry {

	struct efi_variable var;

	struct list_head list;

	struct kobject kobj;

};



int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *,

fs/efivarfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, 


	inode_lock(inode);

	inode->i_private = entry;

	i_size_write(inode, size + sizeof(entry->var.Attributes));

	i_size_write(inode, size + sizeof(__u32)); /* attributes + data */

	inode_unlock(inode);

	d_add(dentry, inode);