From 9a8ac25c28fb5cd312e3f7d308fcf868545c6b93 Mon Sep 17 00:00:00 2001 From: bobijam Date: Thu, 13 Dec 2007 05:32:06 +0000 Subject: [PATCH] Branch HEAD b=12211 i=green, adilger commit the missing part and use a proper macro (thanks shadow for finding it out). --- lustre/lvfs/autoMakefile.am | 2 +- lustre/obdclass/linux/linux-sysctl.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am index 658e540..0a825c7 100644 --- a/lustre/lvfs/autoMakefile.am +++ b/lustre/lvfs/autoMakefile.am @@ -74,7 +74,7 @@ install-data-hook: $(install_data_hook) DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \ lvfs_internal.h lvfs_linux.c lvfs_userfs.c \ - upcall_cache.c \ + upcall_cache.c prng.c lvfs_lib.c \ lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c \ # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c index b5d950e..121fdf9 100644 --- a/lustre/obdclass/linux/linux-sysctl.c +++ b/lustre/obdclass/linux/linux-sysctl.c @@ -184,10 +184,8 @@ int LL_PROC_PROTO(proc_pages_max) #ifdef RANDOM_FAIL_ALLOC int LL_PROC_PROTO(proc_alloc_fail_rate) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) - loff_t *ppos = &filp->f_pos; -#endif int rc = 0; + DECLARE_LL_PROC_PPOS_DECL; if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) { *lenp = 0; -- 1.8.3.1