git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[safe/jmp/linux-2.6]
/
fs
/
ocfs2
/
dlm
/
dlmfs.c
diff --git
a/fs/ocfs2/dlm/dlmfs.c
b/fs/ocfs2/dlm/dlmfs.c
index
3516d8a
..
6f7a77d
100644
(file)
--- a/
fs/ocfs2/dlm/dlmfs.c
+++ b/
fs/ocfs2/dlm/dlmfs.c
@@
-608,8
+608,10
@@
static int __init init_dlmfs_fs(void)
0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD),
dlmfs_init_once);
- if (!dlmfs_inode_cache)
+ if (!dlmfs_inode_cache) {
+ status = -ENOMEM;
goto bail;
+ }
cleanup_inode = 1;
user_dlm_worker = create_singlethread_workqueue("user_dlm");