From b3b302e136f55fcd61b734525314e531dec024c1 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Mon, 27 Apr 2009 13:31:12 -0500 Subject: [PATCH] --- yaml --- r: 144351 b: refs/heads/master c: ac20100df7a7a042423dcb8847f42d9f6ddb8d00 h: refs/heads/master i: 144349: 22046d43207d6e3606e64e3e21fac87f73db3855 144347: a02367b8f697cf386c551ad1b8dfffa76a71d64e 144343: 20eea2184c627dd6f57eb7d5b49f8bcc399e2d6e 144335: 619feb6a7806651922bf4c5958f37a284274851c 144319: fd7fdeb8e65133f0e62f8498b613d1d5837f6538 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eaccc43ffc66..59257b0971bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 802b352f2934f799ec2e159f61db6506094a936e +refs/heads/master: ac20100df7a7a042423dcb8847f42d9f6ddb8d00 diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c index 1940edd08307..2f0945d63297 100644 --- a/trunk/fs/ecryptfs/inode.c +++ b/trunk/fs/ecryptfs/inode.c @@ -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