Merge with Linux 2.4.0-test5-pre4.

1 files changed, 20 insertions, 1 deletions

diff --git a/fs/file_table.c b/fs/file_table.c
index 2eaceae07..f50058828 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -136,7 +136,7 @@ static void __fput(struct file *filp)
 		mntput(mnt);
 }
 
-void _fput(struct file *file)
+static void _fput(struct file *file)
 {
 	locks_remove_flock(file);
 	__fput(file);
@@ -148,6 +148,25 @@ void _fput(struct file *file)
 	file_list_unlock();
 }
 
+void fput(struct file * file)
+{
+	if (atomic_dec_and_test(&file->f_count))
+		_fput(file);
+}
+
+struct file * fget(unsigned int fd)
+{
+	struct file * file = NULL;
+	struct files_struct *files = current->files;
+
+	read_lock(&files->file_lock);
+	file = fcheck(fd);
+	if (file)
+		get_file(file);
+	read_unlock(&files->file_lock);
+	return file;
+}
+
 /* Here. put_filp() is SMP-safe now. */
 
 void put_filp(struct file *file)