summaryrefslogtreecommitdiffstats
path: root/fs/minix
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-09-19 19:15:08 +0000
commit03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch)
tree88db8dba75ae06ba3bad08e42c5e52efc162535c /fs/minix
parent257730f99381dd26e10b832fce4c94cae7ac1176 (diff)
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'fs/minix')
-rw-r--r--fs/minix/dir.c1
-rw-r--r--fs/minix/file.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 4c407817b..dc3e63347 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -31,6 +31,7 @@ static struct file_operations minix_dir_operations = {
NULL, /* ioctl - default */
NULL, /* mmap */
NULL, /* no special open code */
+ NULL, /* flush */
NULL, /* no special release code */
file_fsync /* default fsync */
};
diff --git a/fs/minix/file.c b/fs/minix/file.c
index a44a635b0..f6ddda021 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -42,6 +42,7 @@ static struct file_operations minix_file_operations = {
NULL, /* ioctl - default */
generic_file_mmap, /* mmap */
NULL, /* no special open is needed */
+ NULL, /* flush */
NULL, /* release */
minix_sync_file /* fsync */
};