evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lustre: don't leak llog handle in llog_cat_process_cb()

Browse source 
An early return from llog_cat_process_cb() was leaking the llog
handle. Fix this by not doing that.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/7847
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4054
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond 2014-02-09 02:51:49 -05:00 • committed by Greg Kroah-Hartman
parent e93a3082fc
commit 7345fb75e0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/lustre/lustre/obdclass/llog_cat.c
View file

@ -551,9 +551,8 @@ int llog_cat_process_cb(const struct lu_env *env, struct llog_handle *cat_llh,
if (rec->lrh_index < d->lpd_startcat) if (rec->lrh_index < d->lpd_startcat)
/* Skip processing of the logs until startcat */ /* Skip processing of the logs until startcat */
return 0; rc = 0;
else if (d->lpd_startidx > 0) {
if (d->lpd_startidx > 0) {
struct llog_process_cat_data cd; struct llog_process_cat_data cd;
cd.lpcd_first_idx = d->lpd_startidx; cd.lpcd_first_idx = d->lpd_startidx;
@ -566,6 +565,7 @@ int llog_cat_process_cb(const struct lu_env *env, struct llog_handle *cat_llh,
rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data, rc = llog_process_or_fork(env, llh, d->lpd_cb, d->lpd_data,
NULL, false); NULL, false);
} }
llog_handle_put(llh); llog_handle_put(llh);
return rc; return rc;