From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 8 Dec 2003 07:31:57 +0000 (+0000)
Subject: vol-linux-dont-assume-ext2-20031208
X-Git-Tag: openafs-devel-1_3_51~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=36ac69eedca1b2de6119ddd19b99dd302d5a496b;p=packages%2Fo%2Fopenafs.git

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.
---

diff --git a/src/vol/devname.c b/src/vol/devname.c
index 24dfd6a3b..f614bc3b9 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -86,11 +86,6 @@ RCSID
 #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
 
 
 #ifdef HAVE_STRING_H
@@ -196,7 +191,7 @@ vol_DevName(dev_t adev, char *wpath)
 	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;