- use 'last_received' name for last_rcvd file

- use journalled data mode on mds

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 9c76666..73fb1d8 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -34,7 +34,7 @@
 #define MOUNT_CONFIGS_DIR "CONFIGS"
 /* Persistent mount data are stored on the disk in this file. */
 #define MOUNT_DATA_FILE    MOUNT_CONFIGS_DIR"/mountdata"
-#define LAST_RCVD         "last_rcvd"
+#define LAST_RCVD         "last_received"
 #define LOV_OBJID         "lov_objid"
 #define HEALTH_CHECK      "health_check"
 

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 7a15034..034aec0 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -1270,7 +1270,7 @@ static int mkfs_mdt(struct mkfs_opts *mop)
                 goto out_umount;
         }
 
-        snprintf(filepnm, sizeof(filepnm) - 1, "%s/%s", mntpt, "last_rcvd");
+        snprintf(filepnm, sizeof(filepnm) - 1, "%s/%s", mntpt, "last_received");
         ret = touch_file(filepnm);
         if (ret) {
                 goto out_umount;
@@ -1481,6 +1481,8 @@ int main(int argc, char *argv[])
                 if (IS_MDT(ldd) || IS_MGS(ldd))
                         strcat(always_mountopts,
                                ",iopen_nopriv,user_xattr");
+                if (IS_MDT(ldd))
+                        strcat(always_mountopts, ",data=journal");
                 if ((get_os_version() == 24) && IS_OST(ldd))
                         strcat(always_mountopts, ",asyncdel");
                 /* NB: Files created while extents are enabled cannot be read