summaryrefslogtreecommitdiffstats
path: root/fs/minix
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-01 04:02:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-01 04:02:08 +0000
commitfd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch)
tree217f87a997699505e0dd752931409b9f10fffe65 /fs/minix
parentc02e0599c4233f97071928f8118841954bacdadf (diff)
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'fs/minix')
-rw-r--r--fs/minix/fsync.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/minix/fsync.c b/fs/minix/fsync.c
index 9510d6364..44606d260 100644
--- a/fs/minix/fsync.c
+++ b/fs/minix/fsync.c
@@ -328,10 +328,14 @@ int V2_minix_sync_file(struct inode * inode, struct file * file)
}
/*
- * The function which is called for file synchronization.
+ * The function which is called for file synchronization. File may be
+ * NULL
*/
-int minix_sync_file(struct inode * inode, struct file * file)
+
+int minix_sync_file(struct file * file, struct dentry *dentry)
{
+ struct inode *inode = dentry->d_inode;
+
if (INODE_VERSION(inode) == MINIX_V1)
return V1_minix_sync_file(inode, file);
else