Merge with Linux 2.3.38.

1 files changed, 1 insertions, 20 deletions

diff --git a/fs/fifo.c b/fs/fifo.c
index 516e690c9..88d8bd33b 100644
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -153,28 +153,9 @@ err_nolock_nocleanup:
  * depending on the access mode of the file...
  */
 static struct file_operations def_fifo_fops = {
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	fifo_open,		/* will set read or write pipe_fops */
-	NULL,
-	NULL,
-	NULL,
-	NULL
+	open:	fifo_open,	/* will set read or write pipe_fops */
 };
 
 struct inode_operations fifo_inode_operations = {
 	&def_fifo_fops,		/* default file operations */
 };
-
-
-/* Goner. Filesystems do not use it anymore. */
-
-void init_fifo(struct inode * inode)
-{
-	inode->i_op = &fifo_inode_operations;
-}