summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLi Xi <pkuelelixi@gmail.com>2013-11-14 16:13:17 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-15 04:23:04 (GMT)
commit2a0f0eacd7d75e8fa79d642aa85bcf7c681187a7 (patch)
tree65f0f92b6352439bd1785bfd9d082345b67dc70d /drivers
parentc7c99012dd68feaebd7f6e0df9251bb62e184e9a (diff)
downloadlinux-2a0f0eacd7d75e8fa79d642aa85bcf7c681187a7.tar.xz
staging/lustre/llog: fix return value of llog_alloc_handle
llog_open() calls llog_alloc_handle() taking NULL as the error return value. But llog_alloc_handle() returns ERR_PTR(-ENOMEM) instead when error. Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3470 Lustre-change: http://review.whamcloud.com/6644 Signed-off-by: Li Xi <pkuelelixi@gmail.com> Reviewed-by: Mike Pershin <mike.pershin@intel.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Peng Tao <bergwolf@gmail.com> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/lustre/lustre/obdclass/llog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c
index 0cb4428..b4dad34 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog.c
@@ -62,7 +62,7 @@ struct llog_handle *llog_alloc_handle(void)
OBD_ALLOC_PTR(loghandle);
if (loghandle == NULL)
- return ERR_PTR(-ENOMEM);
+ return NULL;
init_rwsem(&loghandle->lgh_lock);
spin_lock_init(&loghandle->lgh_hdr_lock);