[PATCH 5/9] Use %pd in eCryptFS

[PATCH 5/9] Use %pd in eCryptFS

[David Howells]

Use the new %pd printk() specifier in eCryptFS to replace passing of dentry
name or dentry name and name length * 2 with just passing the dentry.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Tyler Hicks <tyhicks@canonical.com>
cc: ecryptfs@vger.kernel.org
---

 fs/ecryptfs/file.c  |    4 ++--
 fs/ecryptfs/inode.c |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index b1eaa7a1f82c..c705360e2b16 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -230,8 +230,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
 	if (rc) {
 		printk(KERN_ERR "%s: Error attempting to initialize "
 			"the lower file for the dentry with name "
-			"[%s]; rc = [%d]\n", __func__,
-			ecryptfs_dentry->d_name.name, rc);
+			"[%pd]; rc = [%d]\n", __func__,
+			ecryptfs_dentry, rc);
 		goto out_free;
 	}
 	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_ACCMODE)
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index c36c44824471..87ad33e091e9 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -250,8 +250,8 @@ int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,
 	if (rc) {
 		printk(KERN_ERR "%s: Error attempting to initialize "
 			"the lower file for the dentry with name "
-			"[%s]; rc = [%d]\n", __func__,
-			ecryptfs_dentry->d_name.name, rc);
+			"[%pd]; rc = [%d]\n", __func__,
+			ecryptfs_dentry, rc);
 		goto out;
 	}
 	rc = ecryptfs_write_metadata(ecryptfs_dentry, ecryptfs_inode);
@@ -313,8 +313,8 @@ static int ecryptfs_i_size_read(struct dentry *dentry, struct inode *inode)
 	if (rc) {
 		printk(KERN_ERR "%s: Error attempting to initialize "
 			"the lower file for the dentry with name "
-			"[%s]; rc = [%d]\n", __func__,
-			dentry->d_name.name, rc);
+			"[%pd]; rc = [%d]\n", __func__,
+			dentry, rc);
 		return rc;
 	}
 
@@ -418,8 +418,8 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
 	if (IS_ERR(lower_dentry)) {
 		rc = PTR_ERR(lower_dentry);
 		ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned "
-				"[%d] on lower_dentry = [%s]\n", __func__, rc,
-				ecryptfs_dentry->d_name.name);
+				"[%d] on lower_dentry = [%pd]\n", __func__, rc,
+				ecryptfs_dentry);
 		goto out;
 	}
 	if (lower_dentry->d_inode)

Re: [PATCH 5/9] Use %pd in eCryptFS

[Tyler Hicks]

[-- Attachment #1: Type: text/plain, Size: 2969 bytes --]

On 2013-12-10 15:26:48, David Howells wrote:
> Use the new %pd printk() specifier in eCryptFS to replace passing of dentry
> name or dentry name and name length * 2 with just passing the dentry.
> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: Tyler Hicks <tyhicks@canonical.com>

Acked-by: Tyler Hicks <tyhicks@canonical.com>

Thanks for the patch! It looks like you're asking the individual
filesystem maintainers to carry the patch so I'll throw it into my -next
branch.

Tyler

> cc: ecryptfs@vger.kernel.org
> ---
> 
>  fs/ecryptfs/file.c  |    4 ++--
>  fs/ecryptfs/inode.c |   12 ++++++------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
> index b1eaa7a1f82c..c705360e2b16 100644
> --- a/fs/ecryptfs/file.c
> +++ b/fs/ecryptfs/file.c
> @@ -230,8 +230,8 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
>  	if (rc) {
>  		printk(KERN_ERR "%s: Error attempting to initialize "
>  			"the lower file for the dentry with name "
> -			"[%s]; rc = [%d]\n", __func__,
> -			ecryptfs_dentry->d_name.name, rc);
> +			"[%pd]; rc = [%d]\n", __func__,
> +			ecryptfs_dentry, rc);
>  		goto out_free;
>  	}
>  	if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_ACCMODE)
> diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
> index c36c44824471..87ad33e091e9 100644
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@ -250,8 +250,8 @@ int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,
>  	if (rc) {
>  		printk(KERN_ERR "%s: Error attempting to initialize "
>  			"the lower file for the dentry with name "
> -			"[%s]; rc = [%d]\n", __func__,
> -			ecryptfs_dentry->d_name.name, rc);
> +			"[%pd]; rc = [%d]\n", __func__,
> +			ecryptfs_dentry, rc);
>  		goto out;
>  	}
>  	rc = ecryptfs_write_metadata(ecryptfs_dentry, ecryptfs_inode);
> @@ -313,8 +313,8 @@ static int ecryptfs_i_size_read(struct dentry *dentry, struct inode *inode)
>  	if (rc) {
>  		printk(KERN_ERR "%s: Error attempting to initialize "
>  			"the lower file for the dentry with name "
> -			"[%s]; rc = [%d]\n", __func__,
> -			dentry->d_name.name, rc);
> +			"[%pd]; rc = [%d]\n", __func__,
> +			dentry, rc);
>  		return rc;
>  	}
>  
> @@ -418,8 +418,8 @@ static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
>  	if (IS_ERR(lower_dentry)) {
>  		rc = PTR_ERR(lower_dentry);
>  		ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned "
> -				"[%d] on lower_dentry = [%s]\n", __func__, rc,
> -				ecryptfs_dentry->d_name.name);
> +				"[%d] on lower_dentry = [%pd]\n", __func__, rc,
> +				ecryptfs_dentry);
>  		goto out;
>  	}
>  	if (lower_dentry->d_inode)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ecryptfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]