patch-2.3.43 linux/mm/swapfile.c

• Lines: 42
• Date: Mon Feb 7 17:48:03 2000
• Orig file: v2.3.42/linux/mm/swapfile.c
• Orig date: Thu Jan 6 12:57:48 2000

diff -u --recursive --new-file v2.3.42/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -445,12 +445,12 @@
 	struct swap_info_struct * p = NULL;
 	struct dentry * dentry;
 	int i, type, prev;
-	int err = -EPERM;
+	int err;
 	
-	lock_kernel();
 	if (!capable(CAP_SYS_ADMIN))
-		goto out;
+		return -EPERM;
 
+	lock_kernel();
 	dentry = namei(specialfile);
 	err = PTR_ERR(dentry);
 	if (IS_ERR(dentry))
@@ -587,7 +587,7 @@
 	struct dentry * swap_dentry;
 	unsigned int type;
 	int i, j, prev;
-	int error = -EPERM;
+	int error;
 	static int least_priority = 0;
 	union swap_header *swap_header = 0;
 	int swap_header_version;
@@ -596,13 +596,14 @@
 	int swapfilesize;
 	struct block_device *bdev = NULL;
 	
-	lock_kernel();
 	if (!capable(CAP_SYS_ADMIN))
-		goto out;
+		return -EPERM;
+	lock_kernel();
 	p = swap_info;
 	for (type = 0 ; type < nr_swapfiles ; type++,p++)
 		if (!(p->flags & SWP_USED))
 			break;
+	error = -EPERM;
 	if (type >= MAX_SWAPFILES)
 		goto out;
 	if (type >= nr_swapfiles)