--- /export/xfs2/XFS/linux-2.4.19/linux/include/linux/fs.h 2002-08-02 19:39:45.000000000 -0500 +++ linux/include/linux/fs.h 2002-12-04 15:44:35.000000000 -0600 @@ -1477,6 +1477,7 @@ extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); extern ssize_t generic_file_read(struct file *, char *, size_t, loff_t *); extern ssize_t 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); --- /export/xfs2/XFS/linux-2.4.19/linux/kernel/ksyms.c 2002-08-02 19:39:46.000000000 -0500 +++ linux/kernel/ksyms.c 2002-11-21 10:11:54.000000000 -0600 @@ -226,6 +243,7 @@ EXPORT_SYMBOL(generic_file_read); EXPORT_SYMBOL(do_generic_file_read); EXPORT_SYMBOL(generic_file_write); +EXPORT_SYMBOL(generic_file_write_nolock); EXPORT_SYMBOL(generic_file_mmap); EXPORT_SYMBOL(generic_ro_fops); EXPORT_SYMBOL(generic_buffer_fdatasync); --- /export/xfs2/XFS/linux-2.4.19/linux/mm/filemap.c 2002-08-02 19:39:46.000000000 -0500 +++ linux/mm/filemap.c 2002-09-25 18:34:15.000000000 -0500 @@ -2924,8 +2924,8 @@ * file system has to do this all by itself, unfortunately. * okir@monad.swb.de */ -ssize_t -generic_file_write(struct file *file,const char *buf,size_t count, loff_t *ppos) +ssize_t generic_file_write_nolock(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; @@ -2945,8 +2945,6 @@ cached_page = NULL; - down(&inode->i_sem); - pos = *ppos; err = -EINVAL; if (pos < 0) @@ -3133,7 +3131,6 @@ err = written ? written : status; out: - up(&inode->i_sem); return err; fail_write: status = -EFAULT; @@ -3171,6 +3159,19 @@ goto out_status; } +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; + int err; + + down(&inode->i_sem); + err = generic_file_write_nolock(file, buf, count, ppos); + up(&inode->i_sem); + + return err; +} + void __init page_cache_init(unsigned long mempages) { unsigned long htable_size, order;