diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:10:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:10:43 -0400 |
| commit | e933424c4823596ed231648eeb602b5209960ff6 (patch) | |
| tree | d1bec768605bd4cc91326b80a02fa6472384bf08 /fs/ecryptfs/messaging.c | |
| parent | 8f2a0029b8aaed9fb37d775dbe527e163920b129 (diff) | |
| parent | 93c3fe40c279f002906ad14584c30671097d4394 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
eCryptfs: Fix encrypted file name lookup regression
ecryptfs: properly mark init functions
fs/ecryptfs: Return -ENOMEM on memory allocation failure
Diffstat (limited to 'fs/ecryptfs/messaging.c')
| -rw-r--r-- | fs/ecryptfs/messaging.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index bcb68c0cb1f0..ab2248090515 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c | |||
| @@ -473,7 +473,7 @@ sleep: | |||
| 473 | return rc; | 473 | return rc; |
| 474 | } | 474 | } |
| 475 | 475 | ||
| 476 | int ecryptfs_init_messaging(void) | 476 | int __init ecryptfs_init_messaging(void) |
| 477 | { | 477 | { |
| 478 | int i; | 478 | int i; |
| 479 | int rc = 0; | 479 | int rc = 0; |