jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary type ViceFid

Browse Source 
The type "ViceFid" is just a clone of the type AFSFid and used only in a couple of places.
Thus, for simplicity, rename all occurences of ViceFid to AFSFid and remove the
typedef itself.

Reviewed-on: http://gerrit.openafs.org/383
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Christof Hanke 2009-08-31 15:39:02 +02:00 committed by Derrick Brashear
parent ac1e6fa1a6
commit 3e28e72e40
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsint/afsint.xg
View File

@ -35,8 +35,6 @@ customized struct AFSAccessList {
char *SeqBody; char *SeqBody;
}; };
typedef AFSFid ViceFid;
typedef afs_int32 ViceDataType; typedef afs_int32 ViceDataType;
%#define Invalid 0 %#define Invalid 0

2
src/packaging/Debian/patches/alloc-vnode
View File

@ -9,7 +9,7 @@ Debian Bug#448380
+++ openafs/src/volser/volprocs.c +++ openafs/src/volser/volprocs.c
@@ -210,14 +210,14 @@ @@ -210,14 +210,14 @@
struct acl_accessList *ACL; struct acl_accessList *ACL;
ViceFid did; AFSFid did;
Inode inodeNumber, nearInode; Inode inodeNumber, nearInode;
- char buf[SIZEOF_LARGEDISKVNODE]; - char buf[SIZEOF_LARGEDISKVNODE];
- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf; - struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;

10
src/vol/vol-salvage.c
View File

@ -2489,7 +2489,7 @@ JudgeEntry(void *dirVal, char *name, afs_int32 vnodeNumber,
Log("dir vnode %u: %s/%s (vnode %u): unique changed from %u to %u %s\n", dir->vnodeNumber, (dir->name ? dir->name : "??"), name, vnodeNumber, unique, vnodeEssence->unique, (!todelete ? "" : (Testing ? "-- would have deleted" : "-- deleted"))); Log("dir vnode %u: %s/%s (vnode %u): unique changed from %u to %u %s\n", dir->vnodeNumber, (dir->name ? dir->name : "??"), name, vnodeNumber, unique, vnodeEssence->unique, (!todelete ? "" : (Testing ? "-- would have deleted" : "-- deleted")));
} }
if (!Testing) { if (!Testing) {
ViceFid fid; AFSFid fid;
fid.Vnode = vnodeNumber; fid.Vnode = vnodeNumber;
fid.Unique = vnodeEssence->unique; fid.Unique = vnodeEssence->unique;
CopyOnWrite(dir); CopyOnWrite(dir);
@ -2503,7 +2503,7 @@ JudgeEntry(void *dirVal, char *name, afs_int32 vnodeNumber,
if (strcmp(name, ".") == 0) { if (strcmp(name, ".") == 0) {
if (dir->vnodeNumber != vnodeNumber || (dir->unique != unique)) { if (dir->vnodeNumber != vnodeNumber || (dir->unique != unique)) {
ViceFid fid; AFSFid fid;
if (!Showmode) if (!Showmode)
Log("directory vnode %u.%u: bad '.' entry (was %u.%u); fixed\n", dir->vnodeNumber, dir->unique, vnodeNumber, unique); Log("directory vnode %u.%u: bad '.' entry (was %u.%u); fixed\n", dir->vnodeNumber, dir->unique, vnodeNumber, unique);
if (!Testing) { if (!Testing) {
@ -2520,7 +2520,7 @@ JudgeEntry(void *dirVal, char *name, afs_int32 vnodeNumber,
} }
dir->haveDot = 1; dir->haveDot = 1;
} else if (strcmp(name, "..") == 0) { } else if (strcmp(name, "..") == 0) {
ViceFid pa; AFSFid pa;
if (dir->parent) { if (dir->parent) {
struct VnodeEssence *dotdot; struct VnodeEssence *dotdot;
pa.Vnode = dir->parent; pa.Vnode = dir->parent;
@ -2871,7 +2871,7 @@ SalvageVolume(register struct InodeSummary *rwIsp, IHandle_t * alinkH)
afs_int32 v, pv; afs_int32 v, pv;
IHandle_t *h; IHandle_t *h;
afs_sfsize_t nBytes; afs_sfsize_t nBytes;
ViceFid pa; AFSFid pa;
VnodeId LFVnode, ThisVnode; VnodeId LFVnode, ThisVnode;
Unique LFUnique, ThisUnique; Unique LFUnique, ThisUnique;
char npath[128]; char npath[128];
@ -2955,7 +2955,7 @@ SalvageVolume(register struct InodeSummary *rwIsp, IHandle_t * alinkH)
* won't be visible there. * won't be visible there.
*/ */
if (class == vLarge) { if (class == vLarge) {
ViceFid pa; AFSFid pa;
DirHandle dh; DirHandle dh;
/* Remove and recreate the ".." entry in this orphaned directory */ /* Remove and recreate the ".." entry in this orphaned directory */

2
src/volser/volprocs.c
View File

@ -237,7 +237,7 @@ ViceCreateRoot(Volume *vp)
{ {
DirHandle dir; DirHandle dir;
struct acl_accessList *ACL; struct acl_accessList *ACL;
ViceFid did; AFSFid did;
Inode inodeNumber, nearInode; Inode inodeNumber, nearInode;
struct VnodeDiskObject *vnode; struct VnodeDiskObject *vnode;
struct VnodeClassInfo *vcp = &VnodeClassInfo[vLarge]; struct VnodeClassInfo *vcp = &VnodeClassInfo[vLarge];