---
fs/configfs/file.c | 112 ++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 2b6cb23..18e2823 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -19,7 +19,7 @@
* Boston, MA 021110-1307, USA.
*
* Based on sysfs:
- * sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
+ * sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
*
* configfs Copyright (C) 2005 Oracle. All rights reserved.
*/
@@ -28,7 +28,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/configfs.h>
#include "configfs_internal.h"
@@ -44,8 +44,8 @@
struct configfs_buffer {
size_t count;
loff_t pos;
- char * page;
- struct configfs_item_operations * ops;
+ char *page;
+ struct configfs_item_operations *ops;
struct mutex mutex;
int needs_read_fill;
};
@@ -61,11 +61,12 @@ struct configfs_buffer {
* data.
* This is called only once, on the file's first read.
*/
-static int fill_read_buffer(struct dentry * dentry, struct configfs_buffer *
buffer)
+static int fill_read_buffer(struct dentry *dentry,
+ struct configfs_buffer *buffer)
{
- struct configfs_attribute * attr = to_attr(dentry);
- struct config_item * item = to_item(dentry->d_parent);
- struct configfs_item_operations * ops = buffer->ops;
+ struct configfs_attribute *attr = to_attr(dentry);
+ struct config_item *item = to_item(dentry->d_parent);
+ struct configfs_item_operations *ops = buffer->ops;
int ret = 0;
ssize_t count;
@@ -74,7 +75,7 @@ static int fill_read_buffer(struct dentry * dentry, struct
configfs_buffer * buf
if (!buffer->page)
return -ENOMEM;
- count = ops->show_attribute(item,attr,buffer->page);
+ count = ops->show_attribute(item, attr, buffer->page);
buffer->needs_read_fill = 0;
BUG_ON(count > (ssize_t)SIMPLE_ATTR_SIZE);
if (count >= 0)
@@ -104,14 +105,16 @@ static int fill_read_buffer(struct dentry * dentry,
struct configfs_buffer * buf
*/
static ssize_t
-configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t
*ppos)
+configfs_read_file(struct file *file, char __user *buf, size_t count,
+ loff_t *ppos)
{
- struct configfs_buffer * buffer = file->private_data;
+ struct configfs_buffer *buffer = file->private_data;
ssize_t retval = 0;
mutex_lock(&buffer->mutex);
if (buffer->needs_read_fill) {
- if ((retval = fill_read_buffer(file->f_path.dentry,buffer)))
+ retval = fill_read_buffer(file->f_path.dentry, buffer);
+ if (retval)
goto out;
}
pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n",
@@ -135,7 +138,8 @@ out:
*/
static int
-fill_write_buffer(struct configfs_buffer * buffer, const char __user * buf,
size_t count)
+fill_write_buffer(struct configfs_buffer *buffer, const char __user *buf,
+ size_t count)
{
int error;
@@ -146,7 +150,7 @@ fill_write_buffer(struct configfs_buffer * buffer, const
char __user * buf, size
if (count >= SIMPLE_ATTR_SIZE)
count = SIMPLE_ATTR_SIZE - 1;
- error = copy_from_user(buffer->page,buf,count);
+ error = copy_from_user(buffer->page, buf, count);
buffer->needs_read_fill = 1;
/* if buf is assumed to contain a string, terminate it by \0,
* so e.g. sscanf() can scan the string easily */
@@ -167,13 +171,14 @@ fill_write_buffer(struct configfs_buffer * buffer, const
char __user * buf, size
*/
static int
-flush_write_buffer(struct dentry * dentry, struct configfs_buffer * buffer,
size_t count)
+flush_write_buffer(struct dentry *dentry, struct configfs_buffer *buffer,
+ size_t count)
{
- struct configfs_attribute * attr = to_attr(dentry);
- struct config_item * item = to_item(dentry->d_parent);
- struct configfs_item_operations * ops = buffer->ops;
+ struct configfs_attribute *attr = to_attr(dentry);
+ struct config_item *item = to_item(dentry->d_parent);
+ struct configfs_item_operations *ops = buffer->ops;
- return ops->store_attribute(item,attr,buffer->page,count);
+ return ops->store_attribute(item, attr, buffer->page, count);
}
@@ -184,7 +189,8 @@ flush_write_buffer(struct dentry * dentry, struct
configfs_buffer * buffer, size
* @count: number of bytes
* @ppos: starting offset
*
- * Similar to configfs_read_file(), though working in the opposite
direction.
+ * Similar to configfs_read_file(), though working in the opposite
+ * direction.
* We allocate and fill the data from the user in fill_write_buffer(),
* then push it to the config_item in flush_write_buffer().
* There is no easy way for us to know if userspace is only doing a partial
@@ -195,9 +201,10 @@ flush_write_buffer(struct dentry * dentry, struct
configfs_buffer * buffer, size
*/
static ssize_t
-configfs_write_file(struct file *file, const char __user *buf, size_t count,
loff_t *ppos)
+configfs_write_file(struct file *file, const char __user *buf, size_t count,
+ loff_t *ppos)
{
- struct configfs_buffer * buffer = file->private_data;
+ struct configfs_buffer *buffer = file->private_data;
ssize_t len;
mutex_lock(&buffer->mutex);
@@ -210,27 +217,28 @@ configfs_write_file(struct file *file, const char __user
*buf, size_t count, lof
return len;
}
-static int check_perm(struct inode * inode, struct file * file)
+static int check_perm(struct inode *inode, struct file *file)
{
- struct config_item *item =
configfs_get_config_item(file->f_path.dentry->d_parent);
- struct configfs_attribute * attr = to_attr(file->f_path.dentry);
- struct configfs_buffer * buffer;
- struct configfs_item_operations * ops = NULL;
+ struct config_item *item =
+ configfs_get_config_item(file->f_path.dentry->d_parent);
+ struct configfs_attribute *attr = to_attr(file->f_path.dentry);
+ struct configfs_buffer *buffer;
+ struct configfs_item_operations *ops = NULL;
int error = 0;
if (!item || !attr)
- goto Einval;
+ goto einval;
/* Grab the module reference for this attribute if we have one */
if (!try_module_get(attr->ca_owner)) {
error = -ENODEV;
- goto Done;
+ goto done;
}
if (item->ci_type)
ops = item->ci_type->ct_item_ops;
else
- goto Eaccess;
+ goto eaccess;
/* File needs write support.
* The inode's perms must say it's ok,
@@ -239,7 +247,7 @@ static int check_perm(struct inode * inode, struct file *
file)
if (file->f_mode & FMODE_WRITE) {
if (!(inode->i_mode & S_IWUGO) || !ops->store_attribute)
- goto Eaccess;
+ goto eaccess;
}
@@ -249,47 +257,47 @@ static int check_perm(struct inode * inode, struct file *
file)
*/
if (file->f_mode & FMODE_READ) {
if (!(inode->i_mode & S_IRUGO) || !ops->show_attribute)
- goto Eaccess;
+ goto eaccess;
}
/* No error? Great, allocate a buffer for the file, and store it
* it in file->private_data for easy access.
*/
- buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL);
+ buffer = kzalloc(sizeof(struct configfs_buffer), GFP_KERNEL);
if (!buffer) {
error = -ENOMEM;
- goto Enomem;
+ goto enomem;
}
mutex_init(&buffer->mutex);
buffer->needs_read_fill = 1;
buffer->ops = ops;
file->private_data = buffer;
- goto Done;
+ goto done;
- Einval:
+ einval:
error = -EINVAL;
- goto Done;
- Eaccess:
+ goto done;
+ eaccess:
error = -EACCES;
- Enomem:
+ enomem:
module_put(attr->ca_owner);
- Done:
+ done:
if (error && item)
config_item_put(item);
return error;
}
-static int configfs_open_file(struct inode * inode, struct file * filp)
+static int configfs_open_file(struct inode *inode, struct file *filp)
{
- return check_perm(inode,filp);
+ return check_perm(inode, filp);
}
-static int configfs_release(struct inode * inode, struct file * filp)
+static int configfs_release(struct inode *inode, struct file *filp)
{
- struct config_item * item = to_item(filp->f_path.dentry->d_parent);
- struct configfs_attribute * attr = to_attr(filp->f_path.dentry);
- struct module * owner = attr->ca_owner;
- struct configfs_buffer * buffer = filp->private_data;
+ struct config_item *item = to_item(filp->f_path.dentry->d_parent);
+ struct configfs_attribute *attr = to_attr(filp->f_path.dentry);
+ struct module *owner = attr->ca_owner;
+ struct configfs_buffer *buffer = filp->private_data;
if (item)
config_item_put(item);
@@ -314,14 +322,15 @@ const struct file_operations configfs_file_operations = {
};
-int configfs_add_file(struct dentry * dir, const struct configfs_attribute *
attr, int type)
+int configfs_add_file(struct dentry *dir, const struct configfs_attribute
*attr,
+ int type)
{
- struct configfs_dirent * parent_sd = dir->d_fsdata;
+ struct configfs_dirent *parent_sd = dir->d_fsdata;
umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
int error = 0;
mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL);
- error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode,
type);
+ error = configfs_make_dirent(parent_sd, NULL, (void *)attr, mode, type);
mutex_unlock(&dir->d_inode->i_mutex);
return error;
@@ -334,7 +343,8 @@ int configfs_add_file(struct dentry * dir, const struct
configfs_attribute * att
* @attr: atrribute descriptor.
*/
-int configfs_create_file(struct config_item * item, const struct
configfs_attribute * attr)
+int configfs_create_file(struct config_item *item,
+ const struct configfs_attribute *attr)
{
BUG_ON(!item || !item->ci_dentry || !attr);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
