From 12f35e84934015251ec4e0171d302e7f10f894c2 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 24 Dec 2009 14:34:42 +0000 Subject: [PATCH] Remove --disable-largefile-fileserver Make largefile fileservers the only option. Remove all of the AFS_LARGEFILE_ENV ifdefs, and tidy up some code as a result of this change. Change-Id: I126f7dc5505bbdb28c9337dcd2e81403045707f4 Reviewed-on: http://gerrit.openafs.org/1029 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear Tested-by: Andrew Deason --- acinclude.m4 | 10 --------- src/config/NTMakefile.amd64_w2k | 1 - src/config/NTMakefile.i386_w2k | 1 - src/config/param.i386_umlinux24.h | 2 -- src/config/stds.h | 7 ------- src/tviced/serialize_state.c | 29 ++------------------------ src/viced/afsfileprocs.c | 10 +-------- src/vol/vnode.h | 7 ------- src/volser/dumpstuff.c | 34 +++++++++++-------------------- src/volser/restorevol.c | 12 ++++------- src/volser/vol-dump.c | 19 +++++++---------- 11 files changed, 26 insertions(+), 106 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index dd37867d5..6db335beb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -48,7 +48,6 @@ AH_VERBATIM([OPENAFS_HEADER], #endif #undef AFS_AFSDB_ENV -#undef AFS_LARGEFILE_ENV #undef AFS_NAMEI_ENV #undef BITMAP_LATER #undef FAST_RESTART @@ -103,11 +102,6 @@ AC_ARG_ENABLE([pam], [AS_HELP_STRING([--disable-pam], [disable PAM support])], , [enable_pam="yes"]) -AC_ARG_ENABLE([largefile-fileserver], - [AS_HELP_STRING([--disable-largefile-fileserver], - [disable large file support in fileserver])], - , - [enable_largefile_fileserver="yes"]) AC_ARG_ENABLE([namei-fileserver], [AS_HELP_STRING([--enable-namei-fileserver], [force compilation of namei fileserver in preference to inode @@ -1471,10 +1465,6 @@ if test "$enable_icmp_pmtu_discovery" = "yes"; then fi fi -if test "$enable_largefile_fileserver" = "yes"; then - AC_DEFINE(AFS_LARGEFILE_ENV, 1, [define if you want large file fileserver]) -fi - if test "$enable_cache_bypass" = "yes"; then AC_DEFINE(AFS_CACHE_BYPASS, 1, [define to activate cache bypassing Unix client]) fi diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 3d63089c7..afda243a9 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -246,7 +246,6 @@ afscdefs =\ -DAFS_64BITUSERPOINTER_ENV \ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ - -DAFS_LARGEFILE_ENV \ -D_USE_DECLSPECS_FOR_SAL=0 \ -D_USE_ATTRIBUTES_FOR_SAL=0 \ -D_ATL_SECURE_NO_DEPRECATE \ diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index c495e203b..6e0b69e92 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -254,7 +254,6 @@ afscdefs =\ -DAFS_FREELANCE_CLIENT \ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ - -DAFS_LARGEFILE_ENV \ $(AFSDEV_AUXCDEFINES) # Compiler switches (except include paths and preprocessor defines) diff --git a/src/config/param.i386_umlinux24.h b/src/config/param.i386_umlinux24.h index 7f1c9c38b..0bad16eae 100644 --- a/src/config/param.i386_umlinux24.h +++ b/src/config/param.i386_umlinux24.h @@ -20,9 +20,7 @@ #define AFS_I386_UMLINUX22_ENV 1 #define AFS_I386_UMLINUX24_ENV 1 -#ifdef AFS_LARGEFILE_ENV #define _FILE_OFFSET_BITS 64 -#endif #else /* !defined(UKERNEL) */ diff --git a/src/config/stds.h b/src/config/stds.h index 1d7007851..46b411a96 100644 --- a/src/config/stds.h +++ b/src/config/stds.h @@ -134,17 +134,10 @@ typedef afs_int32 afs_size_t; typedef afs_uint32 afs_offs_t; #endif /* AFS_64BIT_CLIENT */ -#ifdef AFS_LARGEFILE_ENV typedef afs_int64 afs_foff_t; typedef afs_uint64 afs_fsize_t; typedef afs_int64 afs_sfsize_t; #define SplitOffsetOrSize(t,h,l) SplitInt64(t,h,l) -#else /* !AFS_LARGEFILE_ENV */ -typedef afs_int32 afs_foff_t; -typedef afs_uint32 afs_fsize_t; -typedef afs_int32 afs_sfsize_t; -#define SplitOffsetOrSize(t,h,l) (h) = 0; (l) = (t); -#endif /* !AFS_LARGEFILE_ENV */ /* Maximum integer sizes. Also what is expected by %lld, %llu in * afs_snprintf. */ diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c index eeb1fbe1c..3a81015b8 100644 --- a/src/tviced/serialize_state.c +++ b/src/tviced/serialize_state.c @@ -767,17 +767,9 @@ fs_stateTruncateFile(struct fs_dump_state * state) { int ret = 0; -#ifdef AFS_LARGEFILE_ENV if (afs_ftruncate(state->fd, state->eof_offset) != 0) { ret = 1; } -#else - afs_uint32 hi, lo; - SplitInt64(state->eof_offset, hi, lo); - if (afs_ftruncate(state->fd, lo) != 0) { - ret = 1; - } -#endif return ret; } @@ -934,13 +926,7 @@ fs_stateSeek(struct fs_dump_state * state, afs_uint64 * offset) state->mmap.cursor = (void *) p; /* update offset */ -#ifdef AFS_LARGEFILE_ENV state->mmap.offset = *offset; -#else - if (hi) - ret = 1; - state->mmap.offset = lo; -#endif return ret; } @@ -949,21 +935,10 @@ int fs_stateSeek(struct fs_dump_state * state, afs_uint64 * offset) { int ret = 0; -#ifndef AFS_LARGEFILE_ENV - afs_uint32 high, low; - - SplitInt64(*offset, high, low); - if (high) { - ret = 1; - goto done; - } - - if (afs_lseek(state->fd, low, SEEK_SET) == -1) - ret = 1; -#else + if (afs_lseek(state->fd, *offset, SEEK_SET) == -1) ret = 1; -#endif + return ret; } #endif /* !FS_STATE_USE_MMAP */ diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index fb581a5a1..a4b8e1019 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -2354,10 +2354,6 @@ SRXAFS_FetchData64(struct rx_call * acall, struct AFSFid * Fid, afs_int64 Pos, afs_sfsize_t tPos, tLen; #ifdef AFS_64BIT_ENV -#ifndef AFS_LARGEFILE_ENV - if (Pos + Len > 0x7fffffff) - return EFBIG; -#endif /* !AFS_LARGEFILE_ENV */ tPos = (afs_sfsize_t) Pos; tLen = (afs_sfsize_t) Len; #else /* AFS_64BIT_ENV */ @@ -3192,10 +3188,6 @@ SRXAFS_StoreData64(struct rx_call * acall, struct AFSFid * Fid, afs_fsize_t tFileLength; #ifdef AFS_64BIT_ENV -#ifndef AFS_LARGEFILE_ENV - if (FileLength > 0x7fffffff) - return EFBIG; -#endif /* !AFS_LARGEFILE_ENV */ tPos = (afs_fsize_t) Pos; tLength = (afs_fsize_t) Length; tFileLength = (afs_fsize_t) FileLength; @@ -6283,7 +6275,7 @@ SRXAFS_GetCapabilities(struct rx_call * acall, Capabilities * capabilities) dataBytes = 1 * sizeof(afs_int32); dataBuffP = (afs_uint32 *) malloc(dataBytes); dataBuffP[0] = VICED_CAPABILITY_ERRORTRANS | VICED_CAPABILITY_WRITELOCKACL; -#if defined(AFS_64BIT_ENV) && defined(AFS_LARGEFILE_ENV) +#if defined(AFS_64BIT_ENV) dataBuffP[0] |= VICED_CAPABILITY_64BITFILES; #endif if (saneacls) diff --git a/src/vol/vnode.h b/src/vol/vnode.h index 718a0c2a3..8e1c14b5c 100644 --- a/src/vol/vnode.h +++ b/src/vol/vnode.h @@ -221,17 +221,10 @@ typedef struct Vnode { #define Vn_id(vnp) ((vnp)->vnodeNumber) -#ifdef AFS_LARGEFILE_ENV #define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) #define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->vn_length_hi, (V)->length) #define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.vn_length_hi, (V)->disk.length) #define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->vn_length_hi, (V)->length) -#else /* !AFS_LARGEFILE_ENV */ -#define VN_GET_LEN(N, V) (N) = (V)->disk.length; -#define VNDISK_GET_LEN(N, V) (N) = (V)->length; -#define VN_SET_LEN(V, N) (V)->disk.length = (N); -#define VNDISK_SET_LEN(V, N) (V)->length = (N); -#endif /* !AFS_LARGEFILE_ENV */ #ifdef AFS_64BIT_IOPS_ENV #define VN_GET_INO(V) ((Inode)((V)->disk.vn_ino_lo | \ diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 001ae0a0f..313f26f81 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -711,17 +711,18 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) afs_sfsize_t n, nbytes, howMany, howBig; afs_foff_t lcode = 0; byte *p; + afs_uint32 hi, lo; #ifndef AFS_NT40_ENV struct afs_stat status; #endif afs_sfsize_t size; #ifdef AFS_AIX_ENV #include -#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV) +#if defined(AFS_AIX52_ENV) struct statfs64 tstatfs; -#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ +#else /* !AFS_AIX52_ENV */ struct statfs tstatfs; -#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ +#endif /* !AFS_AIX52_ENV */ int statfs_code; #endif @@ -737,11 +738,11 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) /* Unfortunately in AIX valuable fields such as st_blksize are * gone from the stat structure. */ -#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV) +#if defined(AFS_AIX52_ENV) statfs_code = fstatfs64(handleP->fd_fd, &tstatfs); -#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ +#else /* !AFS_AIX52_ENV */ statfs_code = fstatfs(handleP->fd_fd, &tstatfs); -#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ +#endif /* !AFS_AIX52_ENV */ if (statfs_code != 0) { Log("DumpFile: fstatfs returned error code %d on descriptor %d\n", errno, handleP->fd_fd); return VOLSERDUMPERROR; @@ -754,19 +755,12 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) size = FDH_SIZE(handleP); -#ifdef AFS_LARGEFILE_ENV - { - afs_uint32 hi, lo; - SplitInt64(size, hi, lo); - if (hi == 0L) { - code = DumpInt32(iodp, 'f', lo); - } else { - code = DumpDouble(iodp, 'h', hi, lo); - } + SplitInt64(size, hi, lo); + if (hi == 0L) { + code = DumpInt32(iodp, 'f', lo); + } else { + code = DumpDouble(iodp, 'h', hi, lo); } -#else /* !AFS_LARGEFILE_ENV */ - code = DumpInt32(iodp, 'f', size); -#endif /* !AFS_LARGEFILE_ENV */ if (code) { return VOLSERDUMPERROR; } @@ -1400,9 +1394,7 @@ ReadVnodes(register struct iod *iodp, Volume * vp, int incremental, VAclDiskSize(vnode)); acl_NtohACL(VVnodeDiskACL(vnode)); break; -#ifdef AFS_LARGEFILE_ENV case 'h': -#endif case 'f':{ Inode ino; Error error; @@ -1530,14 +1522,12 @@ volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP, int tag, #ifdef AFS_64BIT_ENV { afs_uint32 filesize_high = 0L, filesize_low = 0L; -#ifdef AFS_LARGEFILE_ENV if (tag == 'h') { if (!ReadInt32(iodp, &filesize_high)) { *status = 1; return 0; } } -#endif /* !AFS_LARGEFILE_ENV */ if (!ReadInt32(iodp, &filesize_low)) { *status = 1; return 0; diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index e619df024..620e87b4e 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -396,6 +396,7 @@ ReadVNode(afs_int32 count) int len; afs_int32 vnode; afs_int32 mode = 0; + afs_uint32 hi, lo; /* memset(&vn, 0, sizeof(vn)); */ vn.dataSize = 0; @@ -454,16 +455,11 @@ ReadVNode(afs_int32 count) readdata(vn.acl, 192); /* Skip ACL data */ break; -#ifdef AFS_LARGEFILE_ENV case 'h': - { - afs_uint32 hi, lo; - hi = ntohl(readvalue(4)); - lo = ntohl(readvalue(4)); - FillInt64(vn.dataSize, hi, lo); - } + hi = ntohl(readvalue(4)); + lo = ntohl(readvalue(4)); + FillInt64(vn.dataSize, hi, lo); goto common_vnode; -#endif /* !AFS_LARGEFILE_ENV */ case 'f': vn.dataSize = ntohl(readvalue(4)); diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index e389c5be4..ae743ad2c 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -559,6 +559,7 @@ DumpFile(int dumpfd, int vnode, FdHandle_t * handleP, struct VnodeDiskObject *v afs_int32 offset = 0; afs_sfsize_t n, nbytes, howMany, howBig; byte *p; + afs_uint32 hi, lo; #ifndef AFS_NT40_ENV struct afs_stat status; #endif @@ -598,19 +599,13 @@ DumpFile(int dumpfd, int vnode, FdHandle_t * handleP, struct VnodeDiskObject *v (unsigned int) howBig, (unsigned int) howMany, (unsigned int) size); -#ifdef AFS_LARGEFILE_ENV - { - afs_uint32 hi, lo; - SplitInt64(size, hi, lo); - if (hi == 0L) { - code = DumpInt32(dumpfd, 'f', lo); - } else { - code = DumpDouble(dumpfd, 'h', hi, lo); - } + SplitInt64(size, hi, lo); + if (hi == 0L) { + code = DumpInt32(dumpfd, 'f', lo); + } else { + code = DumpDouble(dumpfd, 'h', hi, lo); } -#else /* !AFS_LARGEFILE_ENV */ - code = DumpInt32(dumpfd, 'f', size); -#endif /* !AFS_LARGEFILE_ENV */ + if (code) { return VOLSERDUMPERROR; } -- 2.39.5