From: shaver Date: Tue, 15 Jul 2003 08:53:47 +0000 (+0000) Subject: Land b_unify on b_devel. X-Git-Tag: v1_7_100~1^368~76 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=397cdb27141b1840fb6e978570cd474a96c60bf4;p=fs%2Flustre-release.git Land b_unify on b_devel. Highlights include: - intent rework from Peter and Phil - unification of VFS intent strategy for 2.4 and 2.5/2.6 - select 2.5 kernel patches from b_ad - all the whitespace fixes you can imagine. Complete diff for sanity-checking at http://off.net/~shaver/unify-landing.diff. --- diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c index ab20b82..f830d41 100644 --- a/lustre/cobd/cache_obd.c +++ b/lustre/cobd/cache_obd.c @@ -36,7 +36,7 @@ static int cobd_attach(struct obd_device *dev, obd_count len, void *data) { struct lprocfs_static_vars lvars; - lprocfs_init_vars(&lvars); + lprocfs_init_vars(cobd, &lvars); return lprocfs_obd_attach(dev, lvars.obd_vars); } @@ -313,12 +313,12 @@ static int __init cobd_init(void) printk(KERN_INFO "Lustre Caching OBD driver; info@clusterfs.com\n"); - lprocfs_init_vars(&lvars); + lprocfs_init_vars(cobd, &lvars); RETURN(class_register_type(&cobd_ops, lvars.module_vars, OBD_CACHE_DEVICENAME)); } -static void __exit cobd_exit(void) +static void /*__exit*/ cobd_exit(void) { class_unregister_type(OBD_CACHE_DEVICENAME); } diff --git a/lustre/cobd/lproc_cache.c b/lustre/cobd/lproc_cache.c index fd7474b..93729cb 100644 --- a/lustre/cobd/lproc_cache.c +++ b/lustre/cobd/lproc_cache.c @@ -25,8 +25,8 @@ #include #ifndef LPROCFS -struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; -struct lprocfs_vars lprocfs_module_vars[] = { {0} }; +static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; +static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; #else /* Common STATUS namespace */ static int rd_target(char *page, char **start, off_t off, int count, @@ -75,17 +75,17 @@ static int rd_cache(char *page, char **start, off_t off, int count, return (rc); } -struct lprocfs_vars lprocfs_obd_vars[] = { +static struct lprocfs_vars lprocfs_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, { "target_uuid", rd_target, 0, 0 }, { "cache_uuid", rd_cache, 0, 0 }, { 0 } }; -struct lprocfs_vars lprocfs_module_vars[] = { +static struct lprocfs_vars lprocfs_module_vars[] = { { "num_refs", lprocfs_rd_numrefs, 0, 0 }, { 0 } }; #endif /* LPROCFS */ -LPROCFS_INIT_VARS(lprocfs_module_vars, lprocfs_obd_vars) +LPROCFS_INIT_VARS(cobd, lprocfs_module_vars, lprocfs_obd_vars) diff --git a/lustre/kernel_patches/patches/lustre_version.patch b/lustre/kernel_patches/patches/lustre_version.patch index 78855ac..c987485 100644 --- a/lustre/kernel_patches/patches/lustre_version.patch +++ b/lustre/kernel_patches/patches/lustre_version.patch @@ -7,6 +7,6 @@ --- /dev/null Fri Aug 30 17:31:37 2002 +++ linux-2.4.18-18.8.0-l12-braam/include/linux/lustre_version.h Thu Feb 13 07:58:33 2003 @@ -0,0 +1 @@ -+#define LUSTRE_KERNEL_VERSION 19 ++#define LUSTRE_KERNEL_VERSION 21 _ diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 2ef001d..814cad2 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -6,8 +6,7 @@ chaos-2.4.20 linux-chaos-2.4.20 same as rh-2.4.20-8 rh-2.4.20 linux-rh-2.4.20-8 same as chaos-2.4.20 rh-2.4.18-18 linux-rh-2.4.18-18 same as chaos but includes uml chaos linux-chaos-2.4.18 same as rh-2.4.18-18 but no uml +kgdb-2.5.72 linux-2.5.72 vanilla based with kgdb REVIEW: - -vanilla-2.5 linux-2.5.63 hp-pnnl linux-2.4.19-hp2_pnnl6 diff --git a/lustre/obdclass/fsfilt_ext3.c b/lustre/obdclass/fsfilt_ext3.c index a3b295f..05dfd6c 100644 --- a/lustre/obdclass/fsfilt_ext3.c +++ b/lustre/obdclass/fsfilt_ext3.c @@ -476,7 +476,7 @@ static int fsfilt_ext3_journal_data(struct file *filp) */ static int fsfilt_ext3_statfs(struct super_block *sb, struct obd_statfs *osfs) { - struct statfs sfs; + struct kstatfs sfs; int rc = vfs_statfs(sb, &sfs); if (!rc && sfs.f_bfree < sfs.f_ffree) { diff --git a/lustre/obdclass/statfs_pack.c b/lustre/obdclass/statfs_pack.c index 786a768..5a04110 100644 --- a/lustre/obdclass/statfs_pack.c +++ b/lustre/obdclass/statfs_pack.c @@ -31,7 +31,7 @@ #else #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) -#include +#include #endif #endif @@ -40,7 +40,7 @@ #include #include -void statfs_pack(struct obd_statfs *osfs, struct statfs *sfs) +void statfs_pack(struct obd_statfs *osfs, struct kstatfs *sfs) { osfs->os_type = sfs->f_type; osfs->os_blocks = sfs->f_blocks; @@ -52,7 +52,7 @@ void statfs_pack(struct obd_statfs *osfs, struct statfs *sfs) osfs->os_namelen = sfs->f_namelen; } -void statfs_unpack(struct statfs *sfs, struct obd_statfs *osfs) +void statfs_unpack(struct kstatfs *sfs, struct obd_statfs *osfs) { sfs->f_type = osfs->os_type; sfs->f_blocks = osfs->os_blocks; @@ -64,7 +64,7 @@ void statfs_unpack(struct statfs *sfs, struct obd_statfs *osfs) sfs->f_namelen = osfs->os_namelen; } -int obd_self_statfs(struct obd_device *obd, struct statfs *sfs) +int obd_self_statfs(struct obd_device *obd, struct kstatfs *sfs) { struct obd_export *export, *my_export = NULL; struct obd_statfs osfs = { 0 };