Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74bedc4d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

libfs: rename simple_attr_close to simple_attr_release 



simple_attr_close implementes ->release so it should be named accordingly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: <stefano.brivio@polimi.it>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg KH <greg@kroah.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9261303a

arch/powerpc/platforms/cell/spufs/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -470,7 +470,7 @@ spufs_cntl_release(struct inode *inode, struct file *file) 
	struct spufs_inode_info *i = SPUFS_I(inode);

	struct spufs_inode_info *i = SPUFS_I(inode);

	struct spu_context *ctx = i->i_ctx;

	struct spu_context *ctx = i->i_ctx;





	simple_attr_close(inode, file);

	simple_attr_release(inode, file);





	mutex_lock(&ctx->mapping_lock);

	mutex_lock(&ctx->mapping_lock);

	if (!--i->i_openers)

	if (!--i->i_openers)

fs/libfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -615,7 +615,7 @@ int simple_attr_open(struct inode *inode, struct file *file, 
	return nonseekable_open(inode, file);

	return nonseekable_open(inode, file);

}

}





int simple_attr_close(struct inode *inode, struct file *file)

int simple_attr_release(struct inode *inode, struct file *file)

{

{

	kfree(file->private_data);

	kfree(file->private_data);

	return 0;

	return 0;
@@ -804,6 +804,6 @@ EXPORT_SYMBOL(simple_transaction_get); 
EXPORT_SYMBOL(simple_transaction_read);

EXPORT_SYMBOL(simple_transaction_read);

EXPORT_SYMBOL(simple_transaction_release);

EXPORT_SYMBOL(simple_transaction_release);

EXPORT_SYMBOL_GPL(simple_attr_open);

EXPORT_SYMBOL_GPL(simple_attr_open);

EXPORT_SYMBOL_GPL(simple_attr_close);

EXPORT_SYMBOL_GPL(simple_attr_release);

EXPORT_SYMBOL_GPL(simple_attr_read);

EXPORT_SYMBOL_GPL(simple_attr_read);

EXPORT_SYMBOL_GPL(simple_attr_write);
 
EXPORT_SYMBOL_GPL(simple_attr_write);

include/linux/fs.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -2056,7 +2056,7 @@ static int __fops ## _open(struct inode *inode, struct file *file) \ 
static struct file_operations __fops = {				\

static struct file_operations __fops = {				\

	.owner	 = THIS_MODULE,						\

	.owner	 = THIS_MODULE,						\

	.open	 = __fops ## _open,					\

	.open	 = __fops ## _open,					\

	.release = simple_attr_close,					\

	.release = simple_attr_release,					\

	.read	 = simple_attr_read,					\

	.read	 = simple_attr_read,					\

	.write	 = simple_attr_write,					\

	.write	 = simple_attr_write,					\

};

};
@@ -2070,7 +2070,7 @@ __simple_attr_check_format(const char *fmt, ...) 
int simple_attr_open(struct inode *inode, struct file *file,

int simple_attr_open(struct inode *inode, struct file *file,

		     int (*get)(void *, u64 *), int (*set)(void *, u64),

		     int (*get)(void *, u64 *), int (*set)(void *, u64),

		     const char *fmt);

		     const char *fmt);

int simple_attr_close(struct inode *inode, struct file *file);

int simple_attr_release(struct inode *inode, struct file *file);

ssize_t simple_attr_read(struct file *file, char __user *buf,

ssize_t simple_attr_read(struct file *file, char __user *buf,

			 size_t len, loff_t *ppos);

			 size_t len, loff_t *ppos);

ssize_t simple_attr_write(struct file *file, const char __user *buf,

ssize_t simple_attr_write(struct file *file, const char __user *buf,