The patch titled
eCryptfs: Remove debugging cruft
has been removed from the -mm tree. Its filename is
ecryptfs-remove-debugging-cruft.patch
This patch was dropped because it was folded into ecryptfs-fs-makefile-and-fs-kconfig.patch
------------------------------------------------------
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
@@ -200,7 +200,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
origin.patch
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-remove-debugging-cruft.patch
ecryptfs-get_sb_dev-fix.patch
ecryptfs-validate-minimum-header-extent-size.patch
ecryptfs-validate-body-size.patch
ecryptfs-validate-packet-length-prior-to-parsing-add-comments.patch
ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch
ecryptfs-change-the-maximum-size-check-when-writing-header.patch
ecryptfs-print-the-actual-option-that-is-problematic.patch
ecryptfs-add-a-maintainers-entry.patch
ecryptfs-partial-signed-integer-to-size_t-conversion-updated-ii.patch
ecryptfs-graceful-handling-of-mount-error.patch
ecryptfs-fix-printk-format-warnings.patch
ecryptfs-associate-vfsmount-with-dentry-rather-than-superblock.patch
ecryptfs-mntput-lower-mount-on-umount_begin.patch
vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-ecryptfs.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
ecryptfs-inode-numbering-fixes.patch
ecryptfs-versioning-fixes.patch
ecryptfs-versioning-fixes-tidy.patch
ecryptfs-grab-lock-on-lower_page-in-ecryptfs_sync_page.patch
ecryptfs-enable-plaintext-passthrough.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
