Re: 2.5.69-mm1

[William Lee Irwin III <wli@holomorphy.com>]

On Sun, May 04, 2003 at 11:16:50PM -0700, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/2.5.69/2.5.69-mm1/
> Various random fixups, cleanps and speedups.  Mainly a resync to 2.5.69.

fs/file_table.c: In function `fget_light':
fs/file_table.c:209: warning: passing arg 1 of `_raw_read_lock' from incompatible pointer type


diff -urpN mm1-2.5.69-1/fs/file_table.c mm1-2.5.69-2/fs/file_table.c
--- mm1-2.5.69-1/fs/file_table.c	2003-05-05 13:32:43.000000000 -0700
+++ mm1-2.5.69-2/fs/file_table.c	2003-05-05 13:38:39.000000000 -0700
@@ -206,13 +206,13 @@ struct file *fget_light(unsigned int fd,
 	if (likely((atomic_read(&files->count) == 1))) {
 		file = fcheck(fd);
 	} else {
-		read_lock(&files->file_lock);
+		spin_lock(&files->file_lock);
 		file = fcheck(fd);
 		if (file) {
 			get_file(file);
 			*fput_needed = 1;
 		}
-		read_unlock(&files->file_lock);
+		spin_unlock(&files->file_lock);
 	}
 	return file;
 }