From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 10 Jan 2004 17:28:57 +0000 (+0000)
Subject: STABLE12-vol-linux-dont-assume-ext2-20031208
X-Git-Tag: openafs-stable-1_2_11~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=33a7ca27ee23691595d4b9e4a8eccb1bd0a35818;p=packages%2Fo%2Fopenafs.git

STABLE12-vol-linux-dont-assume-ext2-20031208


to deal simply with /usr/include/linux potentially having 2.6 kernel headers
in newer linuxes. given that we might not have ext2 as root, this check
probably wasn't sufficient anyway.


(cherry picked from commit 36ac69eedca1b2de6119ddd19b99dd302d5a496b)
---

diff --git a/src/vol/devname.c b/src/vol/devname.c
index 90813e0f6..4ce5f9957 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -85,11 +85,6 @@ RCSID("$Header$");
 #include <sys/time.h>
 #endif /* ITIMER_REAL */
 #include "partition.h"
-#ifdef AFS_LINUX22_ENV
-#include <asm/types.h>
-#include <linux/ext2_fs.h>
-#define ROOTINO EXT2_ROOT_INO /* Assuming we do this on ext2, of course. */
-#endif
 
 /* ensure that we don't have a "/" instead of a "/dev/rxd0a" type of device.
  * returns pointer to static storage; copy it out quickly!
@@ -180,7 +175,7 @@ dev_t adev; {
 	if (stat(part, &status) == -1) {
 	    continue;
 	}
-#ifndef AFS_SGI_XFS_IOPS_ENV
+#if !defined(AFS_SGI_XFS_IOPS_ENV) && !defined(AFS_LINUX22_ENV)
 	if ((status.st_ino != ROOTINO) /*|| ((status.st_mode & S_IFMT) != S_IFBLK)*/) {
 	    continue;
 	}