[PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [9/10] [4/4]

From: O.Sezer
Date: Mon Aug 23 2004 - 12:25:16 EST


splitted-up the fs/* gcc3.4-inline-patches.

[4/4] fs/xfs/linux-2.4/xfs_lrw.c

Someone please verify / correct this.


--- 28p1/include/linux/fs.h~ 2004-08-16 20:23:00.000000000 +0300
+++ 28p1/include/linux/fs.h 2004-08-17 13:02:49.000000000 +0300
@@ -1528,7 +1528,7 @@
extern int generic_file_mmap(struct file *, struct vm_area_struct *);
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 inline ssize_t do_generic_direct_read(struct file *, char *, size_t, loff_t *);
+extern ssize_t do_generic_direct_read(struct file *, char *, size_t, loff_t *);
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 void do_generic_file_read(struct file *, loff_t *, read_descriptor_t *, read_actor_t);
--- 28p1/mm/filemap.c~ 2004-04-14 16:05:41.000000000 +0300
+++ 28p1/mm/filemap.c 2004-08-23 20:04:20.000000000 +0300
@@ -1747,7 +1747,7 @@
return size;
}

-inline ssize_t do_generic_direct_read(struct file * filp, char * buf, size_t count, loff_t *ppos)
+ssize_t do_generic_direct_read(struct file * filp, char * buf, size_t count, loff_t *ppos)
{
ssize_t retval;
loff_t pos = *ppos;