Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / include / linux / key.h

diff --git a/include/linux/key.h b/include/linux/key.h
index be3995d1024afd4164ffb5418e966d10f30bb61a..96933b1e5d24eeee3dde80b5336b0053a0c1d06e 100644 (file)
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -155,6 +155,7 @@ struct key {
 #define KEY_FLAG_IN_QUOTA      3       /* set if key consumes quota */
 #define KEY_FLAG_USER_CONSTRUCT        4       /* set if key is being constructed in userspace */
 #define KEY_FLAG_NEGATIVE      5       /* set if key is negative */
+#define KEY_FLAG_ROOT_CAN_CLEAR        6       /* set if key can be cleared by root without permission */
 
        /* the description string
         * - this is used to match a key against search criteria