From f26364ed837f241ed6523da413eb60fea98945c7 Mon Sep 17 00:00:00 2001 From: phil Date: Mon, 23 Feb 2004 22:57:39 +0000 Subject: [PATCH] merge HEAD into b_size, in preparation for landing --- lustre/lvfs/lvfs_linux.c | 9 --------- lustre/obdfilter/filter_io_26.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index 935548e..2855b52 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -352,8 +352,6 @@ EXPORT_SYMBOL(l_readdir); EXPORT_SYMBOL(obd_memory); EXPORT_SYMBOL(obd_memmax); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - static int __init lvfs_linux_init(void) { RETURN(0); @@ -377,10 +375,3 @@ MODULE_LICENSE("GPL"); module_init(lvfs_linux_init); module_exit(lvfs_linux_exit); - -#else - -#warning "lvfs_linux_init() and fsfilt_ext3_exit() aren't called on 2.6. MUST be fixed" - - -#endif diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c index fb43702..e5ee245 100644 --- a/lustre/obdfilter/filter_io_26.c +++ b/lustre/obdfilter/filter_io_26.c @@ -134,7 +134,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount, push_ctxt(&saved, &obd->obd_ctxt, NULL); cleanup_phase = 2; - oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, oti); + oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, res, oti); if (IS_ERR(oti->oti_handle)) { rc = PTR_ERR(oti->oti_handle); CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR, -- 1.8.3.1