Branch b1_6

Update mkfs.lustre's idea of the latest e2fsprogs version.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a18d123..8111ab8 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -23,13 +23,13 @@ Severity   : normal
 Bugzilla   : 12584
 Description: sanity.sh failed test 103
 Details    : RHEL mis-interpret setfacl "-X" param, so we won't test setfacl
-             with param "-X".
+            with param "-X".
 
 Severity   : normal
 Bugzilla   : 12192
 Description: llapi_file_create() does not allow some changes
 Details    : add llapi_file_open() that allows specifying the mode and 
-             open flags, and also returns an open file handle.
+            open flags, and also returns an open file handle.
 
 Severity   : normal
 Bugzilla   : 12743

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index b846448..29e95dd 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -410,7 +410,7 @@ static int file_in_dev(char *file_name, char *dev_name)
                         fprintf(stderr, "In all likelihood, the "
                                 "'unsupported feature' is 'extents', which "
                                 "older debugfs does not understand.\n"
-                                "Use e2fsprogs-1.39-cfs8 or later, available "
+                                "Use e2fsprogs-1.40.2-cfs1 or later, available "
                                 "from ftp://ftp.lustre.org/pub/lustre/other/"
                                 "e2fsprogs/\n");
                 }