From 291ad30562d9c3170be611c4e3ad7e30e0e9fdaf Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 22 Jul 2003 13:50:37 +0000 Subject: [PATCH] partial merge of b_unify into b_devel (20030722_0202) --- lustre/include/linux/lustre_fsfilt.h | 4 ++-- lustre/kernel_patches/which_patch | 18 +++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h index 97c7d2e..37ffc4f5 100644 --- a/lustre/include/linux/lustre_fsfilt.h +++ b/lustre/include/linux/lustre_fsfilt.h @@ -206,13 +206,13 @@ static inline int fs_prep_san_write(struct obd_device *obd, } static inline int fsfilt_read_record(struct obd_device *obd, struct file *file, - char *buf, loff_t size, loff_t *offs) + char *buf, loff_t size, loff_t *offs) { return obd->obd_fsops->fs_read_record(file, buf, size, offs); } static inline int fsfilt_write_record(struct obd_device *obd, struct file *file, - char *buf, loff_t size, loff_t *offs) + char *buf, loff_t size, loff_t *offs) { return obd->obd_fsops->fs_write_record(file, buf, size, offs); } diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 4ba0202..28e8648 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,12 +1,8 @@ -SERIES MEMNONIC COMMENT +SERIES MEMNONIC COMMENT ARCH -hp-pnnl-2.4.20 linux-2.4.20-hp4_pnnl1 same as vanilla but no uml -vanilla-2.4.20 linux-2.4.20 patch includes uml -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 UNSUPPORTED -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: -hp-pnnl linux-2.4.19-hp2_pnnl6 +chaos-2.4.18 linux-chaos-2.4.18 LLNL 2.4.18 chaos ~65 i386 +hp-pnnl-2.4.20 linux-2.4.20-hp4_pnnl1 same as vanilla but no uml ia64 +vanilla-2.4.20 linux-2.4.20 patch with uml-2.4.20-6 um +chaos-2.4.20 linux-chaos-2.4.20 same as rh-2.4.20-8 i386 +rh-2.4.20 linux-rh-2.4.20-8 same as chaos-2.4.20 i386 +kgdb-2.5.73 linux-2.5.73 vanilla 2.5.73 with kgdb i386 -- 1.8.3.1