Browse Source

sysfs: make bin attr open get active reference of parent too

All bin attr operations require active references of itself and its
parent.  There's no reason to allow open when its parent has been
deactivated and allowing it is inconsistent with regular sysfs file.
Use sysfs_get_active_two() in bin attribute open function.

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>
Tejun Heo 17 years ago
parent
commit
078ce6409c
1 changed files with 5 additions and 5 deletions
  1. 5 5
      fs/sysfs/bin.c

+ 5 - 5
fs/sysfs/bin.c

@@ -171,8 +171,8 @@ static int open(struct inode * inode, struct file * file)
 	struct bin_buffer *bb = NULL;
 	struct bin_buffer *bb = NULL;
 	int error;
 	int error;
 
 
-	/* need attr_sd for attr */
-	if (!sysfs_get_active(attr_sd))
+	/* binary file operations requires both @sd and its parent */
+	if (!sysfs_get_active_two(attr_sd))
 		return -ENODEV;
 		return -ENODEV;
 
 
 	error = -EACCES;
 	error = -EACCES;
@@ -193,12 +193,12 @@ static int open(struct inode * inode, struct file * file)
 	mutex_init(&bb->mutex);
 	mutex_init(&bb->mutex);
 	file->private_data = bb;
 	file->private_data = bb;
 
 
-	/* open succeeded, put active reference */
-	sysfs_put_active(attr_sd);
+	/* open succeeded, put active references */
+	sysfs_put_active_two(attr_sd);
 	return 0;
 	return 0;
 
 
  err_out:
  err_out:
-	sysfs_put_active(attr_sd);
+	sysfs_put_active_two(attr_sd);
 	kfree(bb);
 	kfree(bb);
 	return error;
 	return error;
 }
 }