--- linux-2.4.21/include/linux/fs.h.org	2003-08-22 16:46:25.000000000 +0200
+++ linux-2.4.21/include/linux/fs.h	2003-08-22 16:55:50.000000000 +0200
@@ -1520,6 +1520,7 @@
 extern int precheck_file_write(struct file *, struct inode *, size_t *, loff_t *);
 extern ssize_t generic_file_write(struct file *, const char *, size_t, loff_t *);
 extern ssize_t do_generic_file_write(struct file *, const char *, size_t, loff_t *);
+extern ssize_t generic_file_write_nolock(struct file *, const char *, size_t, loff_t *);
 extern void do_generic_file_read(struct file *, loff_t *, read_descriptor_t *, read_actor_t);
 extern loff_t no_llseek(struct file *file, loff_t offset, int origin);
 extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin);
--- linux-2.4.21/mm/filemap.c.org	2003-08-22 16:46:26.000000000 +0200
+++ linux-2.4.21/mm/filemap.c	2003-08-22 17:26:13.000000000 +0200
@@ -3266,7 +3266,7 @@
 }
 
 ssize_t
-do_generic_direct_write(struct file *file,const char *buf,size_t count, loff_t *ppos)
+do_generic_direct_write_noinvalidate(struct file *file,const char *buf,size_t count, loff_t *ppos)
 {
 	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
 	struct inode	*inode = mapping->host;
@@ -3297,7 +3297,6 @@
 			mark_inode_dirty(inode);
 		}
 		*ppos = end;
-		invalidate_inode_pages2(mapping);
 	}
 	/*
 	 * Sync the fs metadata but not the minor inode changes and
@@ -3311,6 +3310,19 @@
 	return err;
 }
 
+ssize_t
+do_generic_direct_write(struct file *file,const char *buf,size_t count, loff_t *ppos)
+{
+	int		err;
+
+	err = do_generic_direct_write_noinvalidate(file, buf, count, ppos);
+
+	if (err > 0)
+		invalidate_inode_pages2(file->f_dentry->d_inode->i_mapping);
+
+	return err;
+}
+
 static int do_odirect_fallback(struct file *file, struct inode *inode,
 			       const char *buf, size_t count, loff_t *ppos)
 {
@@ -3328,6 +3340,23 @@
 }
 
 ssize_t
+generic_file_write_nolock(struct file *file,const char *buf,size_t count, loff_t *ppos)
+{
+	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
+	int		err;
+
+	if (file->f_flags & O_DIRECT) {
+		err = do_generic_direct_write_noinvalidate(file, buf, count, ppos);
+		if (unlikely(err == -ENOTBLK))
+			err = do_odirect_fallback(file, inode, buf, count, ppos);
+	} else {
+		err = do_generic_file_write(file, buf, count, ppos);
+	}
+
+	return err;
+}
+
+ssize_t
 generic_file_write(struct file *file,const char *buf,size_t count, loff_t *ppos)
 {
 	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;