From 99a7e12f34b3661a0d1354eef83a0eef4df5e34c Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 5 Feb 2000 06:47:02 +0000
Subject: Merge with Linux 2.3.38.

---
 fs/udf/file.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'fs/udf/file.c')

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 2e17d81d4..81cddaa3f 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -46,31 +46,23 @@
 static loff_t udf_file_llseek(struct file *, loff_t, int);
 static ssize_t udf_file_read_adinicb (struct file *, char *, size_t, loff_t *);
 static ssize_t udf_file_write (struct file *, const char *, size_t, loff_t *);
-#if BITS_PER_LONG < 64
 static int udf_open_file(struct inode *, struct file *);
-#endif
 static int udf_release_file(struct inode *, struct file *);
 
 static struct file_operations udf_file_operations = {
 	udf_file_llseek,	/* llseek */
 	generic_file_read,	/* read */
 	udf_file_write,		/* write */
-	NULL,				/* readdir */
-	NULL,				/* poll */
-	udf_ioctl,			/* ioctl */
+	NULL,			/* readdir */
+	NULL,			/* poll */
+	udf_ioctl,		/* ioctl */
 	generic_file_mmap,	/* mmap */
-#if BITS_PER_LONG == 64
-	NULL, 				/* open */
-#else
 	udf_open_file,		/* open */
-#endif
-	NULL,				/* flush */
+	NULL,			/* flush */
 	udf_release_file,	/* release */
 	udf_sync_file,		/* fsync */
-	NULL,				/* fasync */
-	NULL,				/* check_media_change */
-	NULL,				/* revalidate */
-	NULL				/* lock */
+	NULL,			/* fasync */
+	NULL			/* lock */
 };
 
 struct inode_operations udf_file_inode_operations = {
@@ -111,8 +103,6 @@ static struct file_operations udf_file_operations_adinicb = {
 	udf_release_file,	/* release */
 	udf_sync_file,		/* fsync */
 	NULL,				/* fasync */
-	NULL,				/* check_media_change */
-	NULL,				/* revalidate */
 	NULL				/* lock */
 };
 
@@ -426,7 +416,6 @@ static int udf_release_file(struct inode * inode, struct file * filp)
 	return 0;
 }
 
-#if BITS_PER_LONG < 64
 /*
  * udf_open_file
  *
@@ -435,6 +424,7 @@ static int udf_release_file(struct inode * inode, struct file * filp)
  *
  * DESCRIPTION
  *  Use this to disallow opening RW large files on 32 bit systems.
+ *  On 64 bit systems we force on O_LARGEFILE in sys_open.
  *
  * HISTORY
  *
@@ -445,4 +435,3 @@ static int udf_open_file(struct inode * inode, struct file * filp)
 		return -EFBIG;
 	return 0;
 }
-#endif
-- 
cgit v1.2.3