More eCryptfs fixes for 2.6.30-rc3

GIT PULL Tyler Hicks 1 participant 1 message Apr 29, 2009 Ecrypt file system

lore

Share & tools

lore

Tyler Hicks

author

2009-04-29 22:45 UTC #0 lore raw

Hi Linus - Please pull a couple more 2.6.30-rc3 eCryptfs bug fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git for-linus

to get these changes:

Randy Dunlap (1):
ecryptfs: fix printk format warning

Tyler Hicks (1):
eCryptfs: Fix min function comparison warning

fs/ecryptfs/inode.c | 4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)

fs/ecryptfs/inode.c +2 -2

index 93bc0f8..2f0945d 100644
@@ -667,7 +667,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
 	lower_buf = kmalloc(lower_bufsiz, GFP_KERNEL);
 	if (lower_buf == NULL) {
 		printk(KERN_ERR "%s: Out of memory whilst attempting to "
-		       "kmalloc [%d] bytes\n", __func__, lower_bufsiz);
+		       "kmalloc [%zd] bytes\n", __func__, lower_bufsiz);
 		rc = -ENOMEM;
 		goto out;
 	}

@@ -690,7 +690,7 @@ ecryptfs_readlink(struct dentry *dentry, char __user *buf, int bufsiz)
 		}
 		/* Check for bufsiz <= 0 done in sys_readlinkat() */
 		rc = copy_to_user(buf, plaintext_name,
-				  min((unsigned) bufsiz, plaintext_name_size));
+				  min((size_t) bufsiz, plaintext_name_size));
 		if (rc)
 			rc = -EFAULT;
 		else