aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Apostolov <vapo@sgi.com>2007-02-09 03:01:01 +0000
committerVlad Apostolov <vapo@sgi.com>2007-02-09 03:01:01 +0000
commit2696fd1ef23f350c445bf8757cb516eb7e118e90 (patch)
tree1bc9d66d422beb44f6b221b8f755e177350a32e0
parentb3dc41c67b898190a52a3cd401485bf8786ce1c1 (diff)
downloaddmapi-dev-2696fd1ef23f350c445bf8757cb516eb7e118e90.tar.gz
A dmapi enabled xfs filesytem can be mounted with any of the alias mount
options "dmapi", "xdsm" or "dmi". Libdm is missing a check for "dmi" hence the failure with the test 144. Merge of master-melb:xfs-cmds:28053a by kenmcd. pv 960369, rv dgc - libdm is missing a check for "dmi" mount option in get_mnt()
-rw-r--r--VERSION2
-rw-r--r--doc/CHANGES4
-rw-r--r--libdm/dm_handle2path.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 1c0c73f..405d79f 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
#
PKG_MAJOR=2
PKG_MINOR=2
-PKG_REVISION=7
+PKG_REVISION=8
PKG_BUILD=1
diff --git a/doc/CHANGES b/doc/CHANGES
index ecda9a0..987bfa8 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+dmapi-2.2.8 (9 February 2007)
+ - Fix a problem in get_mnt() called by dm_handle_to_path()
+ The "dmi" mount option was not considered.
+
dmapi-2.2.7 (14 July 2006)
- Fix issues with makedepend on libtool libraries.
diff --git a/libdm/dm_handle2path.c b/libdm/dm_handle2path.c
index 1b869fc..339176b 100644
--- a/libdm/dm_handle2path.c
+++ b/libdm/dm_handle2path.c
@@ -294,6 +294,7 @@ get_mnt(
/* skip anything that isn't dmapi */
if ((hasmntopt(mntent, "dmapi") == 0) &&
+ (hasmntopt(mntent, "dmi") == 0) &&
(hasmntopt(mntent, "xdsm") == 0)) {
continue;
}