aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>2009-04-27 13:31:12 -0500
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2009-04-27 13:31:12 -0500
commitac20100df7a7a042423dcb8847f42d9f6ddb8d00 (patch)
tree59aefe9f3a2a0a6216e60d3f4304862b26146047
parent802b352f2934f799ec2e159f61db6506094a936e (diff)
downloadlinux-2.6.34-ux500-ac20100df7a7a042423dcb8847f42d9f6ddb8d00.tar.gz
eCryptfs: Fix min function comparison warning
This warning shows up on 64 bit builds: fs/ecryptfs/inode.c:693: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
-rw-r--r--fs/ecryptfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 1940edd0830..2f0945d6329 100644
--- a/fs/ecryptfs/inode.c
+++ b/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