LU-11803 obd: replace class_uuid with linux kernel version.

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index b3b35eb..2548dbd 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -37,9 +37,11 @@
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <linux/module.h>
+#include <linux/random.h>
 #include <linux/statfs.h>
 #include <linux/time.h>
 #include <linux/types.h>
+#include <libcfs/linux/linux-uuid.h>
 #include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/user_namespace.h>
@@ -71,7 +73,6 @@ static struct ll_sb_info *ll_init_sbi(void)
        unsigned long pages;
        unsigned long lru_page_max;
        struct sysinfo si;
-       class_uuid_t uuid;
        int i;
        ENTRY;
 
@@ -101,10 +102,6 @@ static struct ll_sb_info *ll_init_sbi(void)
        sbi->ll_ra_info.ra_max_pages = sbi->ll_ra_info.ra_max_pages_per_file;
        sbi->ll_ra_info.ra_max_read_ahead_whole_pages = -1;
 
-        ll_generate_random_uuid(uuid);
-        class_uuid_unparse(uuid, &sbi->ll_sb_uuid);
-        CDEBUG(D_CONFIG, "generated uuid: %s\n", sbi->ll_sb_uuid.uuid);
-
         sbi->ll_flags |= LL_SBI_VERBOSE;
 #ifdef ENABLE_CHECKSUM
         sbi->ll_flags |= LL_SBI_CHECKSUM;
@@ -224,10 +221,10 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
                                  OBD_CONNECT_GRANT_PARAM |
                                  OBD_CONNECT_SHORTIO | OBD_CONNECT_FLAGS2;
 
-       data->ocd_connect_flags2 = OBD_CONNECT2_FLR |
-                                  OBD_CONNECT2_LOCK_CONVERT |
-                                  OBD_CONNECT2_DIR_MIGRATE |
+       data->ocd_connect_flags2 = OBD_CONNECT2_DIR_MIGRATE |
                                   OBD_CONNECT2_SUM_STATFS |
+                                  OBD_CONNECT2_FLR |
+                                  OBD_CONNECT2_LOCK_CONVERT |
                                   OBD_CONNECT2_ARCHIVE_ID_ARRAY |
                                   OBD_CONNECT2_LSOM;
 
@@ -1031,6 +1028,7 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
        char name[MAX_STRING_SIZE];
        int md_len = 0;
        int dt_len = 0;
+       uuid_t uuid;
        char *ptr;
        int len;
        int err;
@@ -1055,14 +1053,16 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
        if (err)
                GOTO(out_free_cfg, err);
 
-       err = super_setup_bdi_name(sb, "lustre-%016lx", cfg_instance);
-       if (err)
-               GOTO(out_free_cfg, err);
-
 #ifndef HAVE_DCACHE_LOCK
        /* kernel >= 2.6.38 store dentry operations in sb->s_d_op. */
        sb->s_d_op = &ll_d_ops;
 #endif
+       /* UUID handling */
+       generate_random_uuid(uuid.b);
+       snprintf(sbi->ll_sb_uuid.uuid, UUID_SIZE, "%pU", uuid.b);
+
+       CDEBUG(D_CONFIG, "llite sb uuid: %s\n", sbi->ll_sb_uuid.uuid);
+
        /* Get fsname */
        len = strlen(profilenm);
        ptr = strrchr(profilenm, '-');
@@ -1083,9 +1083,13 @@ int ll_fill_super(struct super_block *sb, struct vfsmount *mnt)
        sbi->ll_fsname[len] = '\0';
 
        /* Mount info */
-       snprintf(name, MAX_STRING_SIZE, "%.*s-%016lx", len,
+       snprintf(name, sizeof(name), "%.*s-%016lx", len,
                 profilenm, cfg_instance);
 
+       err = super_setup_bdi_name(sb, "%s", name);
+       if (err)
+               GOTO(out_free_cfg, err);
+
        /* Call ll_debugfs_register_super() before lustre_process_log()
         * so that "llite.*.*" params can be processed correctly.
         */
@@ -1412,8 +1416,12 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
        /*
         * if dir layout mismatch, check whether version is increased, which
         * means layout is changed, this happens in dir migration and lfsck.
+        *
+        * foreign LMV should not change.
         */
-       if (lli->lli_lsm_md && !lsm_md_eq(lli->lli_lsm_md, lsm)) {
+       if (lli->lli_lsm_md &&
+           lli->lli_lsm_md->lsm_md_magic != LMV_MAGIC_FOREIGN &&
+          !lsm_md_eq(lli->lli_lsm_md, lsm)) {
                if (lsm->lsm_md_layout_version <=
                    lli->lli_lsm_md->lsm_md_layout_version) {
                        CERROR("%s: "DFID" dir layout mismatch:\n",
@@ -1434,6 +1442,15 @@ static int ll_update_lsm_md(struct inode *inode, struct lustre_md *md)
        if (!lli->lli_lsm_md) {
                struct cl_attr  *attr;
 
+               if (lsm->lsm_md_magic == LMV_MAGIC_FOREIGN) {
+                       /* set md->lmv to NULL, so the following free lustre_md
+                        * will not free this lsm */
+                       md->lmv = NULL;
+                       lli->lli_lsm_md = lsm;
+                       up_write(&lli->lli_lsm_sem);
+                       RETURN(0);
+               }
+
                rc = ll_init_lsm_md(inode, md);
                up_write(&lli->lli_lsm_sem);
                if (rc != 0)
@@ -2396,7 +2413,7 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
        rc = md_get_lustre_md(sbi->ll_md_exp, req, sbi->ll_dt_exp,
                              sbi->ll_md_exp, &md);
        if (rc != 0)
-               GOTO(cleanup, rc);
+               GOTO(out, rc);
 
        if (*inode) {
                rc = ll_update_inode(*inode, &md);
@@ -2464,9 +2481,9 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
        GOTO(out, rc = 0);
 
 out:
+       /* cleanup will be done if necessary */
        md_free_lustre_md(sbi->ll_md_exp, &md);
 
-cleanup:
        if (rc != 0 && it != NULL && it->it_op & IT_OPEN)
                ll_open_cleanup(sb != NULL ? sb : (*inode)->i_sb, req);