New release 2.15.64

[fs/lustre-release.git] / lustre / include / uapi / linux / lustre / lustre_cfg.h

diff --git a/lustre/include/uapi/linux/lustre/lustre_cfg.h b/lustre/include/uapi/linux/lustre/lustre_cfg.h
index ab0dc0b..2dcb57a 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_cfg.h
+++ b/lustre/include/uapi/linux/lustre/lustre_cfg.h
@@ -119,7 +119,7 @@ enum lcfg_command_type {
                                                 */
        LCFG_NODEMAP_ADMIN        = 0x00ce049, /**< allow cluster to use id 0 */
        LCFG_NODEMAP_ADD_PROJIDMAP        = 0x00ce04a, /**< add a projidmap */
-       LCFG_NODEMAP_DEL_PROJIDMAP        = 0x00ce04b, /**< delete a projidmap */
+       LCFG_NODEMAP_DEL_PROJIDMAP        = 0x00ce04b, /**< delete projidmap */
        LCFG_NODEMAP_TRUSTED      = 0x00ce050, /**< trust a clusters ids */
        LCFG_NODEMAP_SQUASH_UID   = 0x00ce051, /**< default map uid */
        LCFG_NODEMAP_SQUASH_GID   = 0x00ce052, /**< default map gid */
@@ -141,6 +141,7 @@ enum lcfg_command_type {
        LCFG_NODEMAP_FORBID_ENCRYPT     = 0x00ce05c, /**< forbid encryption */
        LCFG_NODEMAP_SQUASH_PROJID      = 0x00ce05d, /**< default map projid */
        LCFG_NODEMAP_READONLY_MOUNT     = 0x00ce05e, /**< read-only mount */
+       LCFG_NODEMAP_RBAC         = 0x00ce05f, /**< rbac */
 };
 
 struct lustre_cfg_bufs {
@@ -173,7 +174,7 @@ static struct lcfg_type_data lcfg_data_table[] = {
        { LCFG_DETACH, "detach", { "1", "2", "3", "4" } },
        { LCFG_SETUP, "setup", { "UUID", "node", "options", "failout" } },
        { LCFG_CLEANUP, "cleanup", { "1", "2", "3", "4" } },
-       { LCFG_ADD_UUID, "add_uuid", { "node", "2", "3", "4" }  },
+       { LCFG_ADD_UUID, "add_uuid", { "node", "nid", "3", "4" }  },
        { LCFG_DEL_UUID, "del_uuid", { "1", "2", "3", "4" }  },
        { LCFG_MOUNTOPT, "new_profile", { "name", "lov", "lmv", "4" }  },
        { LCFG_DEL_MOUNTOPT, "del_mountopt", { "1", "2", "3", "4" }  },
@@ -264,6 +265,9 @@ static inline void *lustre_cfg_buf(struct lustre_cfg *lcfg, __u32 index)
        if (index >= bufcount)
                return NULL;
 
+       if (!lcfg->lcfg_buflens[index])
+               return NULL;
+
        offset = LCFG_HDR_SIZE(lcfg->lcfg_bufcount);
        for (i = 0; i < index; i++)
                offset += __ALIGN_KERNEL(lcfg->lcfg_buflens[i], 8);