Commit 34237681 authored Sep 04, 2015 by Goldwyn Rodrigues Committed by Linus Torvalds Sep 04, 2015

ocfs2: clear the rest of the buffers on error



In case a validation fails, clear the rest of the buffers and return the
error to the calling function.

This also facilitates bubbling up the error originating from ocfs2_error
to calling functions.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 17a5b9ab

fs/ocfs2/buffer_head_io.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,12 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
		bh = bhs[i];

		if (!(flags & OCFS2_BH_READAHEAD)) {
		if (status) {
		/* Clear the rest of the buffers on error */
		put_bh(bh);
		bhs[i] = NULL;
		continue;
		}
		/* We know this can't have changed as we hold the
		* owner sem. Avoid doing any work on the bh if the
		* journal has it. */