On Mon, Mar 30, 2009 at 03:08:02PM -0400, Brian J. Murrell wrote: > On Sun, 2009-03-29 at 14:23 -0500, Jon Mason wrote: > > > > Hi Jon, > > > If you have > > writeback.h and mpage.h included in lustre_compat25.h (or one of the > > other files), the it could be causing this. > > Indeed, we do include both: > > #include <linux/writeback.h> > #include <linux/mpage.h> /* for generic_writepages */ > > in lustre_compat25.h. > > > Feel free to file a bug. > > I can and will if you wish. If you would prefer to just deal with this > here, that is fine with me too. I just want to work within whatever > processes work best for y'all. > > > One way to resolve it would be to move > > kernel_addons/backport/2.6.18-EL5.3/include/linux/writeback.h > > to > > kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h > > > > I can send you a quick patch to try out, if you are interested. > > Sure. I'm interested in whatever suggestions you might have.
I believe the attached patch will fix the issue. Please download the latest ofed kernel, configure, apply the patch, build and load the new modules. Let me know if it fixes you problem, and I'll make similar changes to RHEL5.1 and RHEL5.2. Thanks, Jon > > b. > > _______________________________________________ > ewg mailing list > [email protected] > http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
commit 75a89199f88f9e2d26688cc68e2921743596e315 Author: Jon Mason <[email protected]> Date: Mon Mar 30 15:14:38 2009 -0500 Lustre possible fix diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 3229e21..d96bf2a 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -12,6 +12,7 @@ #include <linux/pagemap.h> #include <linux/file.h> #include <linux/writeback.h> +#include <linux/mpage.h> #include <linux/swap.h> #include <linux/sunrpc/clnt.h> diff --git a/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h b/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h new file mode 100644 index 0000000..1c5ed55 --- /dev/null +++ b/kernel_addons/backport/2.6.18-EL5.3/include/linux/mpage.h @@ -0,0 +1,15 @@ +#ifndef BACKPORT_LINUX_MPAGE_H +#define BACKPORT_LINUX_MPAGE_H + +#include_next <linux/mpage.h> +#include <linux/pagevec.h> + +typedef int (*backport_writepage_t)(struct page *page, struct writeback_control *wbc, + void *data); + +extern int backport_write_cache_pages(struct address_space *mapping, + struct writeback_control *wbc, backport_writepage_t writepage, + void *data); + +#define write_cache_pages backport_write_cache_pages +#endif diff --git a/kernel_addons/backport/2.6.18-EL5.3/include/linux/writeback.h b/kernel_addons/backport/2.6.18-EL5.3/include/linux/writeback.h deleted file mode 100644 index ed3fd56..0000000 --- a/kernel_addons/backport/2.6.18-EL5.3/include/linux/writeback.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef BACKPORT_LINUX_WRITEBACK_H -#define BACKPORT_LINUX_WRITEBACK_H - -#include_next <linux/writeback.h> -#include <linux/pagevec.h> - -typedef int (*backport_writepage_t)(struct page *page, struct writeback_control *wbc, - void *data); - -extern int backport_write_cache_pages(struct address_space *mapping, - struct writeback_control *wbc, backport_writepage_t writepage, - void *data); - -#define write_cache_pages backport_write_cache_pages -#endif diff --git a/kernel_addons/backport/2.6.18-EL5.3/include/src/writeback.c b/kernel_addons/backport/2.6.18-EL5.3/include/src/writeback.c index fbd4055..7f8ebbe 100644 --- a/kernel_addons/backport/2.6.18-EL5.3/include/src/writeback.c +++ b/kernel_addons/backport/2.6.18-EL5.3/include/src/writeback.c @@ -2,6 +2,7 @@ #include <linux/pagemap.h> #include <linux/pagevec.h> #include <linux/writeback.h> +#include <linux/mpage.h> #include <linux/module.h> int backport_write_cache_pages(struct address_space *mapping,
_______________________________________________ ewg mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
