diff options
Diffstat (limited to 'fs/ecryptfs/miscdev.c')
-rw-r--r-- | fs/ecryptfs/miscdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 72dfec48ea22..0c559731ae34 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
@@ -196,7 +196,7 @@ int ecryptfs_send_miscdev(char *data, size_t data_size, | |||
196 | if (!msg_ctx->msg) { | 196 | if (!msg_ctx->msg) { |
197 | rc = -ENOMEM; | 197 | rc = -ENOMEM; |
198 | printk(KERN_ERR "%s: Out of memory whilst attempting " | 198 | printk(KERN_ERR "%s: Out of memory whilst attempting " |
199 | "to kmalloc(%d, GFP_KERNEL)\n", __func__, | 199 | "to kmalloc(%Zd, GFP_KERNEL)\n", __func__, |
200 | (sizeof(*msg_ctx->msg) + data_size)); | 200 | (sizeof(*msg_ctx->msg) + data_size)); |
201 | goto out_unlock; | 201 | goto out_unlock; |
202 | } | 202 | } |
@@ -232,7 +232,7 @@ out_unlock: | |||
232 | * | 232 | * |
233 | * Returns the number of bytes copied into the user buffer | 233 | * Returns the number of bytes copied into the user buffer |
234 | */ | 234 | */ |
235 | static int | 235 | static ssize_t |
236 | ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count, | 236 | ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count, |
237 | loff_t *ppos) | 237 | loff_t *ppos) |
238 | { | 238 | { |