- /* inode xid tagging */
-#if defined(CONFIG_INOXID_NONE)
- (0 << VCI_KCBIT_TAGXID) |
-#elif defined(CONFIG_INOXID_UID16)
- (1 << VCI_KCBIT_TAGXID) |
-#elif defined(CONFIG_INOXID_GID16)
- (2 << VCI_KCBIT_TAGXID) |
-#elif defined(CONFIG_INOXID_UGID24)
- (3 << VCI_KCBIT_TAGXID) |
-#elif defined(CONFIG_INOXID_INTERN)
- (4 << VCI_KCBIT_TAGXID) |
-#elif defined(CONFIG_INOXID_RUNTIME)
- (5 << VCI_KCBIT_TAGXID) |
+ /* inode context tagging */
+#if defined(CONFIG_TAGGING_NONE)
+ (0 << VCI_KCBIT_TAGGED) |
+#elif defined(CONFIG_TAGGING_UID16)
+ (1 << VCI_KCBIT_TAGGED) |
+#elif defined(CONFIG_TAGGING_GID16)
+ (2 << VCI_KCBIT_TAGGED) |
+#elif defined(CONFIG_TAGGING_ID24)
+ (3 << VCI_KCBIT_TAGGED) |
+#elif defined(CONFIG_TAGGING_INTERN)
+ (4 << VCI_KCBIT_TAGGED) |
+#elif defined(CONFIG_TAGGING_RUNTIME)
+ (5 << VCI_KCBIT_TAGGED) |