diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /fs/ecryptfs/messaging.c | |
| parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe... (diff) | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| download | linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/ecryptfs/messaging.c')
| -rw-r--r-- | fs/ecryptfs/messaging.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index 47d7e7b611f7..3baf253be95a 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c @@ -169,7 +169,8 @@ int ecryptfs_process_helo(unsigned int transport, uid_t uid, pid_t pid) if (!new_id) { rc = -ENOMEM; ecryptfs_printk(KERN_ERR, "Failed to allocate memory; unable " - "to register daemon [%d] for user\n", pid, uid); + "to register daemon [%d] for user [%d]\n", + pid, uid); goto unlock; } if (!ecryptfs_find_daemon_id(uid, &old_id)) { |