From 2ae88a3c272e82391fe72f25ba46d93cb65e18ed Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 20 Sep 2007 16:05:10 +0900 Subject: [PATCH] --- yaml --- r: 67991 b: refs/heads/master c: b05f0548dabd20433f8c201a0307103721d6a18b h: refs/heads/master i: 67989: 7147a1482209317757c96d80fd3a94578accc80a 67987: 9da931881665f142586dd3642b112dca830d2b25 67983: fcc7aad77664f8800fa0b81a241d366fb8068070 v: v3 --- [refs] | 2 +- trunk/fs/sysfs/bin.c | 4 +--- trunk/fs/sysfs/file.c | 6 +----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 61012154cf6a..873a11e37aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13dc89c5a5bd5e34aadb44c0fb7e870959dcd06 +refs/heads/master: b05f0548dabd20433f8c201a0307103721d6a18b diff --git a/trunk/fs/sysfs/bin.c b/trunk/fs/sysfs/bin.c index a819a7e8d74d..e93fe5e2fa41 100644 --- a/trunk/fs/sysfs/bin.c +++ b/trunk/fs/sysfs/bin.c @@ -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: @@ -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; diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c index 61a8c19df7c3..73333dc68545 100644 --- a/trunk/fs/sysfs/file.c +++ b/trunk/fs/sysfs/file.c @@ -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: @@ -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);