patch-2.4.0-test3 linux/arch/alpha/kernel/osf_sys.c

• Lines: 57
• Date: Wed Jul 5 11:31:00 2000
• Orig file: v2.4.0-test2/linux/arch/alpha/kernel/osf_sys.c
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/alpha/kernel/osf_sys.c linux/arch/alpha/kernel/osf_sys.c
@@ -146,7 +146,6 @@
 	buf.count = count;
 	buf.error = 0;
 
-	lock_kernel();
 	error = vfs_readdir(file, osf_filldir, &buf);
 	if (error < 0)
 		goto out_putf;
@@ -156,7 +155,6 @@
 		error = count - buf.count;
 
 out_putf:
-	unlock_kernel();
 	fput(file);
 out:
 	return error;
@@ -230,7 +228,6 @@
 	struct file *file = NULL;
 	unsigned long ret = -EBADF;
 
-	lock_kernel();
 #if 0
 	if (flags & (_MAP_HASSEMAPHORE | _MAP_INHERIT | _MAP_UNALIGNED))
 		printk("%s: unimplemented OSF mmap flags %04lx\n", 
@@ -248,7 +245,6 @@
 	if (file)
 		fput(file);
 out:
-	unlock_kernel();
 	return ret;
 }
 
@@ -320,9 +316,7 @@
 	retval = -EBADF;
 	file = fget(fd);
 	if (file) {
-		lock_kernel();
 		retval = do_osf_statfs(file->f_dentry, buffer, bufsiz);
-		unlock_kernel();
 		fput(file);
 	}
 	return retval;
@@ -491,14 +485,12 @@
 	int fd[2];
 	int error;
 
-	lock_kernel();
 	error = do_pipe(fd);
 	if (error)
 		goto out;
 	(&regs)->r20 = fd[1];
 	error = fd[0];
 out:
-	unlock_kernel();
 	return error;
 }