Coly Li
2008-Nov-17 04:38 UTC
[Ocfs2-devel] [PATCH] ocfs2: fix return value set in init_dlmfs_fs()
In init_dlmfs_fs(), if calling kmem_cache_create() failed, the code will use
return value from
calling bdi_init(). The correct behavior should be set status as -ENOMEM before
going to "bail:".
Signed-off-by: Coly Li <coyli at suse.de>
---
fs/ocfs2/dlm/dlmfs.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index 533a789..ba962d7 100644
--- 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");
--
Coly Li
SuSE PRC Labs
Sunil Mushran
2008-Nov-17 19:05 UTC
[Ocfs2-devel] [PATCH] ocfs2: fix return value set in init_dlmfs_fs()
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com> Coly Li wrote:> In init_dlmfs_fs(), if calling kmem_cache_create() failed, the code will use return value from > calling bdi_init(). The correct behavior should be set status as -ENOMEM before going to "bail:". > > Signed-off-by: Coly Li <coyli at suse.de> > --- > fs/ocfs2/dlm/dlmfs.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c > index 533a789..ba962d7 100644 > --- 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"); > >
Mark Fasheh
2008-Nov-19 16:34 UTC
[Ocfs2-devel] [PATCH] ocfs2: fix return value set in init_dlmfs_fs()
On Mon, Nov 17, 2008 at 12:38:22PM +0800, Coly Li wrote:> In init_dlmfs_fs(), if calling kmem_cache_create() failed, the code will use return value from > calling bdi_init(). The correct behavior should be set status as -ENOMEM before going to "bail:".Thanks, this is in ocfs2.git now. --Mark -- Mark Fasheh