The patch titled
eCryptfs: Remove debugging cruft
has been added to the -mm tree. Its filename is
ecryptfs-remove-debugging-cruft.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: eCryptfs: Remove debugging cruft
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
We let a few debugging statements slip into patch
``ecryptfs-more-intelligent-use-of-tfm-objects''. This patch removes some
extra printk's in the log on mount and unmount.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/crypto.c | 1 -
fs/ecryptfs/main.c | 3 ---
fs/ecryptfs/super.c | 1 -
3 files changed, 5 deletions(-)
diff -puN fs/ecryptfs/crypto.c~ecryptfs-remove-debugging-cruft fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/crypto.c~ecryptfs-remove-debugging-cruft
+++ a/fs/ecryptfs/crypto.c
@@ -186,7 +186,6 @@ void ecryptfs_destruct_crypt_stat(struct
void ecryptfs_destruct_mount_crypt_stat(
struct ecryptfs_mount_crypt_stat *mount_crypt_stat)
{
- printk(KERN_INFO "%s\n", __FUNCTION__);
if (mount_crypt_stat->global_auth_tok_key)
key_put(mount_crypt_stat->global_auth_tok_key);
if (mount_crypt_stat->global_key_tfm)
diff -puN fs/ecryptfs/main.c~ecryptfs-remove-debugging-cruft fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c~ecryptfs-remove-debugging-cruft
+++ a/fs/ecryptfs/main.c
@@ -536,9 +536,6 @@ out:
*/
static void ecryptfs_kill_block_super(struct super_block *sb)
{
- printk(KERN_INFO "%s\n", __FUNCTION__);
-/* ecryptfs_destruct_mount_crypt_stat(
- &(ecryptfs_superblock_to_private(sb)->mount_crypt_stat)); */
generic_shutdown_super(sb);
}
diff -puN fs/ecryptfs/super.c~ecryptfs-remove-debugging-cruft fs/ecryptfs/super.c
--- a/fs/ecryptfs/super.c~ecryptfs-remove-debugging-cruft
+++ a/fs/ecryptfs/super.c
@@ -108,7 +108,6 @@ static void ecryptfs_put_super(struct su
{
struct ecryptfs_sb_info *sb_info = ecryptfs_superblock_to_private(sb);
- printk(KERN_INFO "%s\n", __FUNCTION__);
mntput(sb_info->lower_mnt);
ecryptfs_destruct_mount_crypt_stat(&sb_info->mount_crypt_stat);
kmem_cache_free(ecryptfs_sb_info_cache, sb_info);
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-fs-makefile-and-fs-kconfig-remove-ecrypt_debug-from-fs-kconfig.patch
ecryptfs-documentation.patch
ecryptfs-makefile.patch
ecryptfs-main-module-functions.patch
ecryptfs-main-module-functions-uint16_t-u16.patch
ecryptfs-header-declarations.patch
ecryptfs-header-declarations-update.patch
ecryptfs-header-declarations-update-convert-signed-data-types-to-unsigned-data-types.patch
ecryptfs-header-declarations-remove-unnecessary-ifndefs.patch
ecryptfs-superblock-operations.patch
ecryptfs-dentry-operations.patch
ecryptfs-file-operations.patch
ecryptfs-file-operations-remove-null-==-syntax.patch
ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header.patch
ecryptfs-file-operations-fix.patch
ecryptfs-file-operations-fix-premature-release-of-file_info-memory.patch
ecryptfs-inode-operations.patch
ecryptfs-mmap-operations.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-keystore.patch
ecryptfs-crypto-functions.patch
ecryptfs-crypto-functions-fix-filesize-on-hard-link-creation.patch
ecryptfs-debug-functions.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-convert-assert-to-bug_on.patch
ecryptfs-remove-unnecessary-null-checks.patch
ecryptfs-rewrite-ecryptfs_fsync.patch
ecryptfs-overhaul-file-locking.patch
ecryptfs-dont-muck-with-the-existing-nameidata-structures.patch
ecryptfs-asm-scatterlisth-linux-scatterlisth.patch
ecryptfs-support-for-larger-maximum-key-size.patch
ecryptfs-add-codes-for-additional-ciphers.patch
ecryptfs-unencrypted-key-size-based-on-encrypted-key-size.patch
ecryptfs-packet-and-key-management-update-for-variable-key-size.patch
ecryptfs-add-ecryptfs_-prefix-to-mount-options-key-size-parameter.patch
ecryptfs-set-the-key-size-from-the-default-for-the-mount.patch
ecryptfs-check-for-weak-keys.patch
ecryptfs-add-define-values-for-cipher-codes-from-rfc2440-openpgp.patch
ecryptfs-convert-bits-to-bytes.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-more-intelligent-use-of-tfm-objects.patch
ecryptfs-remove-debugging-cruft.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
