diff --git a/[refs] b/[refs] index cebf96959d43..9c78ab13f4ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93628ffb9ba67c154849ac6c387f98f5e3198b84 +refs/heads/master: c867516de5256e9cfba2ec5847fa27e0f0ddd2c5 diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index 20065c9f2479..9dfdf010f1df 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -316,7 +316,8 @@ static handle_t *new_handle(int nblocks) * This function is visible to journal users (like ext3fs), so is not * called with the journal already locked. * - * Return a pointer to a newly allocated handle, or NULL on failure + * Return a pointer to a newly allocated handle, or an ERR_PTR() value + * on failure. */ handle_t *jbd2__journal_start(journal_t *journal, int nblocks, int gfp_mask) {