From 3797ba0b62debb71af4606910acacc9896a9ae3b Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 25 Jun 2000 01:20:01 +0000
Subject: Merge with Linux 2.4.0-test2.

---
 fs/udf/fsync.c   | 2 +-
 fs/udf/inode.c   | 4 ++--
 fs/udf/super.c   | 1 +
 fs/udf/udfdecl.h | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'fs/udf')

diff --git a/fs/udf/fsync.c b/fs/udf/fsync.c
index 64a5e41a1..e7d067e62 100644
--- a/fs/udf/fsync.c
+++ b/fs/udf/fsync.c
@@ -96,7 +96,7 @@ static int sync_all_extents(struct inode * inode, int wait)
  *	even pass file to fsync ?
  */
 
-int udf_sync_file(struct file * file, struct dentry *dentry, int dsync)
+int udf_sync_file(struct file * file, struct dentry *dentry)
 {
 	int wait, err = 0;
 	struct inode *inode = dentry->d_inode;
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 3c2d50340..8c38883c0 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1213,10 +1213,10 @@ udf_convert_permissions(struct FileEntry *fe)
  *	Written, tested, and released.
  */
 
-void udf_write_inode(struct inode * inode, int wait)
+void udf_write_inode(struct inode * inode)
 {
 	lock_kernel();
-	udf_update_inode(inode, wait);
+	udf_update_inode(inode, 0);
 	unlock_kernel();
 }
 
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f3f575d7e..5f76abbb0 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1419,6 +1419,7 @@ udf_read_super(struct super_block *sb, void *options, int silent)
 	return sb;
 
 error_out:
+	sb->s_dev = NODEV;
 	if (UDF_SB_VAT(sb))
 		iput(UDF_SB_VAT(sb));
 	if (!(sb->s_flags & MS_RDONLY))
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 115db1bef..7dd00bc19 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -134,7 +134,7 @@ extern struct buffer_head * udf_bread(struct inode *, int, int, int *);
 extern void udf_read_inode(struct inode *);
 extern void udf_put_inode(struct inode *);
 extern void udf_delete_inode(struct inode *);
-extern void udf_write_inode(struct inode *, int);
+extern void udf_write_inode(struct inode *);
 extern long udf_locked_block_map(struct inode *, long);
 extern long udf_block_map(struct inode *, long);
 extern int inode_bmap(struct inode *, int, lb_addr *, Uint32 *, lb_addr *, Uint32 *, Uint32 *, struct buffer_head **);
@@ -184,7 +184,7 @@ extern int udf_prealloc_blocks(const struct inode *, Uint16, Uint32, Uint32);
 extern int udf_new_block(const struct inode *, Uint16, Uint32, int *);
 
 /* fsync.c */
-extern int udf_sync_file(struct file *, struct dentry *, int data);
+extern int udf_sync_file(struct file *, struct dentry *);
 
 /* directory.c */
 extern Uint8 * udf_filead_read(struct inode *, Uint8 *, Uint8, lb_addr, int *, int *, struct buffer_head **, int *);
-- 
cgit v1.2.3