From: Eric Sandeen <sandeen@sgi.com>
Date: Wed, 28 Aug 2002 22:03:44 +0000 (+0000)
Subject: Bump version
X-Git-Tag: v2.3.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62419013d96d89d658abad2376abf84a07b4c5d;p=thirdparty%2Fxfsprogs-dev.git

Bump version
---

diff --git a/VERSION b/VERSION
index 0ba7ed95b..1dff2c48a 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=2
-PKG_REVISION=2
+PKG_REVISION=3
 PKG_BUILD=0
diff --git a/doc/CHANGES b/doc/CHANGES
index de86dd927..5f47f7bd3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.2.3 (28 August 2002)
+	- Fix call to lvdisplay on LVM volumes so that lvdisplay
+	  always gets the full, real path to the volume, as required.
+
 xfsprogs-2.2.2 (19 August 2002)
 	- Fix endian bug in xfs_db, was not flipping 16-bit numbers.
 	- Make xfs_repair recognize a NULLFSINO and print that in
diff --git a/libdisk/lvm.c b/libdisk/lvm.c
index e4b63bc02..8e1451fe9 100644
--- a/libdisk/lvm.c
+++ b/libdisk/lvm.c
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <volume.h>
 
 #ifndef LVM_BLK_MAJOR
@@ -64,6 +65,7 @@ lvm_get_subvol_stripe(
 	int		lvpipe[2], stripes = 0, stripesize = 0;
 	char		*largv[3], buf[1024];
 	FILE		*stream;
+	char		tmppath[MAXPATHLEN];
 
 	if (!mnt_is_lvm_subvol(sb->st_rdev))
 		return 0;
@@ -81,7 +83,16 @@ lvm_get_subvol_stripe(
 		return 0;
 	}
 
-	largv[1] = dfile;
+	/* lvm tools want the full, real path to a logical volume.
+	 * (lvm doesn't really open the file, it just wants a
+	 * string that happens to look like a path :/ )
+	 */
+	if (dfile[0] != '/') {
+		getcwd(tmppath, MAXPATHLEN);
+		strcat(tmppath, "/");
+		dfile = strcat(tmppath, dfile);
+	}
+	largv[1] = realpath(dfile, tmppath);
 	largv[2] = NULL;
 
 	/* Open pipe */