From 36ac69eedca1b2de6119ddd19b99dd302d5a496b Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 8 Dec 2003 07:31:57 +0000 Subject: [PATCH] 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. --- src/vol/devname.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vol/devname.c b/src/vol/devname.c index 24dfd6a3b2..f614bc3b90 100644 --- a/src/vol/devname.c +++ b/src/vol/devname.c @@ -86,11 +86,6 @@ RCSID #include #endif /* ITIMER_REAL */ #include "partition.h" -#ifdef AFS_LINUX22_ENV -#include -#include -#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;