dm mpath: simplify failure path of dm_multipath_init()

[pandora-kernel.git] / fs / ecryptfs / debug.c

diff --git a/fs/ecryptfs/debug.c b/fs/ecryptfs/debug.c
index 61f8e89..3d2bdf5 100644 (file)
--- a/fs/ecryptfs/debug.c
+++ b/fs/ecryptfs/debug.c
@@ -36,18 +36,16 @@ void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok)
 
        ecryptfs_printk(KERN_DEBUG, "Auth tok at mem loc [%p]:\n",
                        auth_tok);
-       if (ECRYPTFS_CHECK_FLAG(auth_tok->flags, ECRYPTFS_PRIVATE_KEY)) {
+       if (auth_tok->flags & ECRYPTFS_PRIVATE_KEY) {
                ecryptfs_printk(KERN_DEBUG, " * private key type\n");
-               ecryptfs_printk(KERN_DEBUG, " * (NO PRIVATE KEY SUPPORT "
-                               "IN ECRYPTFS VERSION 0.1)\n");
        } else {
                ecryptfs_printk(KERN_DEBUG, " * passphrase type\n");
                ecryptfs_to_hex(salt, auth_tok->token.password.salt,
                                ECRYPTFS_SALT_SIZE);
                salt[ECRYPTFS_SALT_SIZE * 2] = '\0';
                ecryptfs_printk(KERN_DEBUG, " * salt = [%s]\n", salt);
-               if (ECRYPTFS_CHECK_FLAG(auth_tok->token.password.flags,
-                                       ECRYPTFS_PERSISTENT_PASSWORD)) {
+               if (auth_tok->token.password.flags &
+                   ECRYPTFS_PERSISTENT_PASSWORD) {
                        ecryptfs_printk(KERN_DEBUG, " * persistent\n");
                }
                memcpy(sig, auth_tok->token.password.signature,