efivarfs: Move to fs/efivarfs

Now that efivarfs uses the efivar API, move it out of efivars.c and
into fs/efivarfs where it belongs. This move will eventually allow us
to enable the efivarfs code without having to also enable
CONFIG_EFI_VARS built, and vice versa.

Furthermore, things like,

    mount -t efivarfs none /sys/firmware/efi/efivars

will now work if efivarfs is built as a module without requiring the
use of MODULE_ALIAS(), which would have been necessary when the
efivarfs code was part of efivars.c.

Cc: Matthew Garrett <matthew.garrett@nebula.com>
Cc: Jeremy Kerr <jk@ozlabs.org>
Reviewed-by: Tom Gundersen <teg@jklm.no>
Tested-by: Tom Gundersen <teg@jklm.no>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

10 files changed, 603 insertions, 496 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e4862bf9961..0855f4450e91 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2990,6 +2990,15 @@ F:	arch/x86/platform/efi/*
 F:      drivers/firmware/efivars.c
 F:      include/linux/efi*.h
 
+EFI VARIABLE FILESYSTEM
+M:      Matthew Garrett <matthew.garrett@nebula.com>
+M:      Jeremy Kerr <jk@ozlabs.org>
+M:      Matt Fleming <matt.fleming@intel.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
+L:      linux-efi@vger.kernel.org
+S:      Maintained
+F:      fs/efivarfs/
+
 EFIFB FRAMEBUFFER DRIVER
 L:      linux-fbdev@vger.kernel.org
 M:      Peter Jones <pjones@redhat.com>
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 5e7c3b1acde9..af396758482f 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -94,7 +94,6 @@ MODULE_DESCRIPTION("sysfs interface to EFI Variables");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(EFIVARS_VERSION);
 
-static LIST_HEAD(efivarfs_list);
 LIST_HEAD(efivar_sysfs_list);
 EXPORT_SYMBOL_GPL(efivar_sysfs_list);
 
@@ -558,12 +557,6 @@ static struct kobj_type efivar_ktype = {
         .default_attrs = def_attrs,
 };
 
-static int efivarfs_file_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static int efi_status_to_err(efi_status_t status)
 {
         int err;
@@ -597,493 +590,6 @@ static int efi_status_to_err(efi_status_t status)
         return err;
 }
 
-static ssize_t efivarfs_file_write(struct file *file,
-                const char __user *userbuf, size_t count, loff_t *ppos)
-{
-        struct efivar_entry *var = file->private_data;
-        void *data;
-        u32 attributes;
-        struct inode *inode = file->f_mapping->host;
-        unsigned long datasize = count - sizeof(attributes);
-        ssize_t bytes = 0;
-        bool set = false;
-
-        if (count < sizeof(attributes))
-                return -EINVAL;
-
-        if (copy_from_user(&attributes, userbuf, sizeof(attributes)))
-                return -EFAULT;
-
-        if (attributes & ~(EFI_VARIABLE_MASK))
-                return -EINVAL;
-
-        data = kmalloc(datasize, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        if (copy_from_user(data, userbuf + sizeof(attributes), datasize)) {
-                bytes = -EFAULT;
-                goto out;
-        }
-
-        bytes = efivar_entry_set_get_size(var, attributes, &datasize,
-                                          data, &set);
-        if (!set && bytes)
-                goto out;
-
-        if (!bytes) {
-                mutex_lock(&inode->i_mutex);
-                i_size_write(inode, datasize + sizeof(attributes));
-                mutex_unlock(&inode->i_mutex);
-        } else if (bytes == -ENOENT) {
-                drop_nlink(inode);
-                d_delete(file->f_dentry);
-                dput(file->f_dentry);
-        } else
-                pr_warn("efivarfs: inconsistent EFI variable implementation? "
-                                "status=%zu\n", bytes);
-
-        bytes = count;
-
-out:
-        kfree(data);
-
-        return bytes;
-}
-
-static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf,
-                size_t count, loff_t *ppos)
-{
-        struct efivar_entry *var = file->private_data;
-        unsigned long datasize = 0;
-        u32 attributes;
-        void *data;
-        ssize_t size = 0;
-        int err;
-
-        err = efivar_entry_size(var, &datasize);
-        if (err)
-                return err;
-
-        data = kmalloc(datasize + sizeof(attributes), GFP_KERNEL);
-
-        if (!data)
-                return -ENOMEM;
-
-        size = efivar_entry_get(var, &attributes, &datasize,
-                                data + sizeof(attributes));
-        if (size)
-                goto out_free;
-
-        memcpy(data, &attributes, sizeof(attributes));
-        size = simple_read_from_buffer(userbuf, count, ppos,
-                                       data, datasize + sizeof(attributes));
-out_free:
-        kfree(data);
-
-        return size;
-}
-
-static void efivarfs_evict_inode(struct inode *inode)
-{
-        clear_inode(inode);
-}
-
-static const struct super_operations efivarfs_ops = {
-        .statfs = simple_statfs,
-        .drop_inode = generic_delete_inode,
-        .evict_inode = efivarfs_evict_inode,
-        .show_options = generic_show_options,
-};
-
-static struct super_block *efivarfs_sb;
-
-static const struct inode_operations efivarfs_dir_inode_operations;
-
-static const struct file_operations efivarfs_file_operations = {
-        .open   = efivarfs_file_open,
-        .read   = efivarfs_file_read,
-        .write  = efivarfs_file_write,
-        .llseek = no_llseek,
-};
-
-static struct inode *efivarfs_get_inode(struct super_block *sb,
-                                const struct inode *dir, int mode, dev_t dev)
-{
-        struct inode *inode = new_inode(sb);
-
-        if (inode) {
-                inode->i_ino = get_next_ino();
-                inode->i_mode = mode;
-                inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-                switch (mode & S_IFMT) {
-                case S_IFREG:
-                        inode->i_fop = &efivarfs_file_operations;
-                        break;
-                case S_IFDIR:
-                        inode->i_op = &efivarfs_dir_inode_operations;
-                        inode->i_fop = &simple_dir_operations;
-                        inc_nlink(inode);
-                        break;
-                }
-        }
-        return inode;
-}
-