From f909994d56c11c07e9fa35309107bf5bf3efd8f1 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 11 Jun 2009 20:40:03 +0000 Subject: [PATCH] DEVEL15-vnode-disk-object-name-hi-length-field-20090611 LICENSE IPL10 reserved6 is used for the high portion of the 64 bit length. make the structure reflect it. (cherry picked from commit a7f9ce9ce1b2608937c5c3ffc73a2de07abc5fb1) --- src/vol/fssync-debug.c | 2 +- src/vol/vnode.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c index 4a5fe48..ab09d5e 100644 --- a/src/vol/fssync-debug.c +++ b/src/vol/fssync-debug.c @@ -1075,7 +1075,7 @@ VnQuery(struct cmd_syndesc * as, void * rock) printf("\t\tserverModifyTime = %u\n", v.disk.serverModifyTime); printf("\t\tgroup = %d\n", v.disk.group); printf("\t\tvn_ino_hi = %d\n", v.disk.vn_ino_hi); - printf("\t\treserved6 = %u\n", v.disk.reserved6); + printf("\t\tvn_length_hi = %u\n", v.disk.vn_length_hi); printf("\t}\n"); printf("}\n"); diff --git a/src/vol/vnode.h b/src/vol/vnode.h index 1c5e014..718a0c2 100644 --- a/src/vol/vnode.h +++ b/src/vol/vnode.h @@ -110,7 +110,7 @@ typedef struct VnodeDiskObject { * backup purposes */ afs_int32 group; /* unix group */ afs_int32 vn_ino_hi; /* high part of 64 bit inode. */ - bit32 reserved6; + bit32 vn_length_hi; /* high part of 64 bit length */ /* Missing: * archiving/migration * encryption key @@ -222,10 +222,10 @@ typedef struct Vnode { #ifdef AFS_LARGEFILE_ENV -#define VN_GET_LEN(N, V) FillInt64(N, (V)->disk.reserved6, (V)->disk.length) -#define VNDISK_GET_LEN(N, V) FillInt64(N, (V)->reserved6, (V)->length) -#define VN_SET_LEN(V, N) SplitInt64(N, (V)->disk.reserved6, (V)->disk.length) -#define VNDISK_SET_LEN(V, N) SplitInt64(N, (V)->reserved6, (V)->length) +#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; -- 1.9.4