Skip to content

Commit

Permalink
sysfs: kill unnecessary sysfs_get() in open paths
Browse files Browse the repository at this point in the history
There's no reason to get an extra reference to sysfs_dirent for an
open file.  Open file has a reference to the dentry which in turn has
a reference to sysfs_dirent.  This is fairly obvious as otherwise open
itself won't be able to access the sysfs_dirent.  Kill the extra
sysfs_get() and matching sysfs_put().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tejun Heo authored and Greg Kroah-Hartman committed Oct 12, 2007
1 parent b13dc89 commit b05f054
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 1 addition & 3 deletions fs/sysfs/bin.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,8 @@ static int open(struct inode * inode, struct file * file)
mutex_init(&bb->mutex);
file->private_data = bb;

/* open succeeded, put active reference and pin attr_sd */
/* open succeeded, put active reference */
sysfs_put_active(attr_sd);
sysfs_get(attr_sd);
return 0;

err_out:
Expand All @@ -211,7 +210,6 @@ static int release(struct inode * inode, struct file * file)

if (bb->mmapped)
sysfs_put_active_two(attr_sd);
sysfs_put(attr_sd);
kfree(bb->buffer);
kfree(bb);
return 0;
Expand Down
6 changes: 1 addition & 5 deletions fs/sysfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
buffer->ops = ops;
file->private_data = buffer;

/* open succeeded, put active references and pin attr_sd */
/* open succeeded, put active references */
sysfs_put_active_two(attr_sd);
sysfs_get(attr_sd);
return 0;

err_out:
Expand All @@ -310,11 +309,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)

static int sysfs_release(struct inode * inode, struct file * filp)
{
struct sysfs_dirent *attr_sd = filp->f_path.dentry->d_fsdata;
struct sysfs_buffer *buffer = filp->private_data;

sysfs_put(attr_sd);

if (buffer) {
if (buffer->page)
free_page((unsigned long)buffer->page);
Expand Down

0 comments on commit b05f054

Please sign in to comment.