jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 17:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vol: Only check "logging" on vice partitions

Browse Source 
We don't care about non-vicepX partitions, so move part of the UFS
"logging" check into VCheckPartition. This API should probably redone
so the "am I a vicepX partition" check is done completely separately,
but for now, this will do.

Change-Id: Ib2df2079a392d7ed1a8c2aded34f2a7265215ecd
Reviewed-on: http://gerrit.openafs.org/5514
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Andrew Deason 2011-09-28 15:02:48 -05:00 committed by Derrick Brashear
parent b4f96eb78d
commit 82481c6f44
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/vol/partition.c
View File

@ -274,7 +274,7 @@ VInitPartition(char *path, char *devname, Device dev)
* Use partition name as devname.
*/
int
VCheckPartition(char *part, char *devname)
VCheckPartition(char *part, char *devname, int logging)
{
struct afs_stat_st status;
#if !defined(AFS_LINUX20_ENV) && !defined(AFS_NT40_ENV)
@ -290,6 +290,15 @@ VCheckPartition(char *part, char *devname)
Log("VInitVnodes: Couldn't find file system %s; ignored\n", part);
return 0;
}
if (logging) {
Log("This program is compiled without AFS_NAMEI_ENV, and "
"partition %s is mounted with the 'logging' option. "
"Using the inode fileserver backend with 'logging' UFS "
"partitions causes volume corruption, so please either "
"mount the partition without logging, or use the namei "
"fileserver backend. Aborting...\n", part);
return -1;
}
#ifndef AFS_AIX32_ENV
if (programType == fileServer) {
char salvpath[MAXPATHLEN];
@ -412,7 +421,7 @@ VAttachPartitions2(void)
/* Only keep track of "/vicepx" partitions since automounter
* may hose us */
if (VIsAlwaysAttach(pname, &wouldattach)) {
VCheckPartition(pname, "");
VCheckPartition(pname, "", 0);
} else {
struct afs_stat_st st;
if (wouldattach && VGetPartition(pname, 0) == NULL &&
@ -456,6 +465,7 @@ VAttachPartitions(void)
exit(-1);
}
while (!getmntent(mntfile, &mnt)) {
int logging = 0;
/* Ignore non ufs or non read/write partitions */
/* but allow zfs too if we're in the NAMEI environment */
if (
@ -474,17 +484,11 @@ VAttachPartitions(void)
#ifndef AFS_NAMEI_ENV
if (hasmntopt(&mnt, "logging") != NULL) {
Log("This program is compiled without AFS_NAMEI_ENV, and "
"partition %s is mounted with the 'logging' option. "
"Using the inode fileserver backend with 'logging' UFS "
"partitions causes volume corruption, so please either "
"mount the partition without logging, or use the namei "
"fileserver backend. Aborting...\n", mnt.mnt_mountp);
errors++;
logging = 1;
}
#endif /* !AFS_NAMEI_ENV */
if (VCheckPartition(mnt.mnt_mountp, mnt.mnt_special) < 0)
if (VCheckPartition(mnt.mnt_mountp, mnt.mnt_special, logging) < 0)
errors++;
}
@ -517,7 +521,7 @@ VAttachPartitions(void)
if (VIsAlwaysAttach(mntent->mnt_dir, NULL))
continue;
if (VCheckPartition(mntent->mnt_dir, mntent->mnt_fsname) < 0)
if (VCheckPartition(mntent->mnt_dir, mntent->mnt_fsname, 0) < 0)
errors++;
}
@ -620,7 +624,7 @@ VAttachPartitions(void)
if (VIsAlwaysAttach(part, NULL))
continue;
if (VCheckPartition(part, vmt2dataptr(vmountp, VMT_OBJECT)) < 0)
if (VCheckPartition(part, vmt2dataptr(vmountp, VMT_OBJECT), 0) < 0)
errors++;
}
@ -650,7 +654,7 @@ VAttachPartitions(void)
if (VIsAlwaysAttach(fsent->fs_file, NULL))
continue;
if (VCheckPartition(fsent->fs_file, fsent->fs_spec) < 0)
if (VCheckPartition(fsent->fs_file, fsent->fs_spec, 0) < 0)
errors++;
}
endfsent();
@ -834,7 +838,7 @@ VAttachPartitions(void)
if (VIsAlwaysAttach(mntent->mnt_dir, NULL))
continue;
if (VCheckPartition(mntent->mnt_dir, mntent->mnt_fsname) < 0)
if (VCheckPartition(mntent->mnt_dir, mntent->mnt_fsname, 0) < 0)
errors++;
}
endmntent(mfd);