---

yaml --- r: 40096 b: refs/heads/master c: 559c9ac h: refs/heads/master v: v3
git-mirror · Oct 20, 2006 · 248ef0f · 248ef0f
1 parent bf042a5
commit 248ef0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2057c5a63821e17c8a54dab6db680c77ce7ee6c
+refs/heads/master: 559c9ac391c046710bdeee5581dc5d9dda794881
diff --git a/trunk/fs/configfs/file.c b/trunk/fs/configfs/file.c
@@ -275,20 +275,22 @@ static int check_perm(struct inode * inode, struct file * file)
 	 * it in file->private_data for easy access.
 	 */
 	buffer = kzalloc(sizeof(struct configfs_buffer),GFP_KERNEL);
-	if (buffer) {
-		init_MUTEX(&buffer->sem);
-		buffer->needs_read_fill = 1;
-		buffer->ops = ops;
-		file->private_data = buffer;
-	} else
+	if (!buffer) {
 		error = -ENOMEM;
+		goto Enomem;
+	}
+	init_MUTEX(&buffer->sem);
+	buffer->needs_read_fill = 1;
+	buffer->ops = ops;
+	file->private_data = buffer;
 	goto Done;
 
  Einval:
 	error = -EINVAL;
 	goto Done;
  Eaccess:
 	error = -EACCES;
+ Enomem:
 	module_put(attr->ca_owner);
  Done:
 	if (error && item)