diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-19 13:02:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-19 13:02:34 +0000 |
| commit | 236b11de51c7501c454ca125d84152b06ef7f27e (patch) | |
| tree | d0ca0b99961da2a8a46b4f86a57de8424dadce1d /fs/jbd2 | |
| parent | 0f4cc282951a76011db1da6787b3d2acc63238ca (diff) | |
| parent | ba3e31f87e8b736adf01f1dc09cd5618966ee193 (diff) | |
Merge branch 'ib-mfd-regulator-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-s2mps11
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/transaction.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 8360674c85bc..60bb365f54a5 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -514,11 +514,13 @@ int jbd2_journal_start_reserved(handle_t *handle, unsigned int type, * similarly constrained call sites */ ret = start_this_handle(journal, handle, GFP_NOFS); - if (ret < 0) + if (ret < 0) { jbd2_journal_free_reserved(handle); + return ret; + } handle->h_type = type; handle->h_line_no = line_no; - return ret; + return 0; } EXPORT_SYMBOL(jbd2_journal_start_reserved); |