aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/sysfs/bin.c4
-rw-r--r--fs/sysfs/file.c6
2 files changed, 2 insertions, 8 deletions
diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index a819a7e8d74d..e93fe5e2fa41 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -193,9 +193,8 @@ static int open(struct inode * inode, struct file * file)
193 mutex_init(&bb->mutex); 193 mutex_init(&bb->mutex);
194 file->private_data = bb; 194 file->private_data = bb;
195 195
196 /* open succeeded, put active reference and pin attr_sd */ 196 /* open succeeded, put active reference */
197 sysfs_put_active(attr_sd); 197 sysfs_put_active(attr_sd);
198 sysfs_get(attr_sd);
199 return 0; 198 return 0;
200 199
201 err_out: 200 err_out:
@@ -211,7 +210,6 @@ static int release(struct inode * inode, struct file * file)
211 210
212 if (bb->mmapped) 211 if (bb->mmapped)
213 sysfs_put_active_two(attr_sd); 212 sysfs_put_active_two(attr_sd);
214 sysfs_put(attr_sd);
215 kfree(bb->buffer); 213 kfree(bb->buffer);
216 kfree(bb); 214 kfree(bb);
217 return 0; 215 return 0;
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 61a8c19df7c3..73333dc68545 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -298,9 +298,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
298 buffer->ops = ops; 298 buffer->ops = ops;
299 file->private_data = buffer; 299 file->private_data = buffer;
300 300
301 /* open succeeded, put active references and pin attr_sd */ 301 /* open succeeded, put active references */
302 sysfs_put_active_two(attr_sd); 302 sysfs_put_active_two(attr_sd);
303 sysfs_get(attr_sd);
304 return 0; 303 return 0;
305 304
306 err_out: 305 err_out:
@@ -310,11 +309,8 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
310 309
311static int sysfs_release(struct inode * inode, struct file * filp) 310static int sysfs_release(struct inode * inode, struct file * filp)
312{ 311{
313 struct sysfs_dirent *attr_sd = filp->f_path.dentry->d_fsdata;
314 struct sysfs_buffer *buffer = filp->private_data; 312 struct sysfs_buffer *buffer = filp->private_data;
315 313
316 sysfs_put(attr_sd);
317
318 if (buffer) { 314 if (buffer) {
319 if (buffer->page) 315 if (buffer->page)
320 free_page((unsigned long)buffer->page); 316 free_page((unsigned long)buffer->page);