mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 23:10:58 +00:00
Remove unnecessary type ViceFid
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:
parent
ac1e6fa1a6
commit
3e28e72e40
@ -35,8 +35,6 @@ customized struct AFSAccessList {
|
||||
char *SeqBody;
|
||||
};
|
||||
|
||||
typedef AFSFid ViceFid;
|
||||
|
||||
typedef afs_int32 ViceDataType;
|
||||
|
||||
%#define Invalid 0
|
||||
|
@ -9,7 +9,7 @@ Debian Bug#448380
|
||||
+++ openafs/src/volser/volprocs.c
|
||||
@@ -210,14 +210,14 @@
|
||||
struct acl_accessList *ACL;
|
||||
ViceFid did;
|
||||
AFSFid did;
|
||||
Inode inodeNumber, nearInode;
|
||||
- char buf[SIZEOF_LARGEDISKVNODE];
|
||||
- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
|
||||
|
@ -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")));
|
||||
}
|
||||
if (!Testing) {
|
||||
ViceFid fid;
|
||||
AFSFid fid;
|
||||
fid.Vnode = vnodeNumber;
|
||||
fid.Unique = vnodeEssence->unique;
|
||||
CopyOnWrite(dir);
|
||||
@ -2503,7 +2503,7 @@ JudgeEntry(void *dirVal, char *name, afs_int32 vnodeNumber,
|
||||
|
||||
if (strcmp(name, ".") == 0) {
|
||||
if (dir->vnodeNumber != vnodeNumber || (dir->unique != unique)) {
|
||||
ViceFid fid;
|
||||
AFSFid fid;
|
||||
if (!Showmode)
|
||||
Log("directory vnode %u.%u: bad '.' entry (was %u.%u); fixed\n", dir->vnodeNumber, dir->unique, vnodeNumber, unique);
|
||||
if (!Testing) {
|
||||
@ -2520,7 +2520,7 @@ JudgeEntry(void *dirVal, char *name, afs_int32 vnodeNumber,
|
||||
}
|
||||
dir->haveDot = 1;
|
||||
} else if (strcmp(name, "..") == 0) {
|
||||
ViceFid pa;
|
||||
AFSFid pa;
|
||||
if (dir->parent) {
|
||||
struct VnodeEssence *dotdot;
|
||||
pa.Vnode = dir->parent;
|
||||
@ -2871,7 +2871,7 @@ SalvageVolume(register struct InodeSummary *rwIsp, IHandle_t * alinkH)
|
||||
afs_int32 v, pv;
|
||||
IHandle_t *h;
|
||||
afs_sfsize_t nBytes;
|
||||
ViceFid pa;
|
||||
AFSFid pa;
|
||||
VnodeId LFVnode, ThisVnode;
|
||||
Unique LFUnique, ThisUnique;
|
||||
char npath[128];
|
||||
@ -2955,7 +2955,7 @@ SalvageVolume(register struct InodeSummary *rwIsp, IHandle_t * alinkH)
|
||||
* won't be visible there.
|
||||
*/
|
||||
if (class == vLarge) {
|
||||
ViceFid pa;
|
||||
AFSFid pa;
|
||||
DirHandle dh;
|
||||
|
||||
/* Remove and recreate the ".." entry in this orphaned directory */
|
||||
|
@ -237,7 +237,7 @@ ViceCreateRoot(Volume *vp)
|
||||
{
|
||||
DirHandle dir;
|
||||
struct acl_accessList *ACL;
|
||||
ViceFid did;
|
||||
AFSFid did;
|
||||
Inode inodeNumber, nearInode;
|
||||
struct VnodeDiskObject *vnode;
|
||||
struct VnodeClassInfo *vcp = &VnodeClassInfo[vLarge];
|
||||
|
Loading…
Reference in New Issue
Block a user