Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f3a437f authored by Eric Ren's avatar Eric Ren Committed by Linus Torvalds
Browse files

ocfs2: fix improper handling of return errno 

Previously, if a bad inode was found in ocfs2_iget(), -ESTALE was
returned back to the caller anyway.  Since commit d2b9d71a2da7 ("ocfs2:
check/fix inode block for online file check") can handle with return
value from ocfs2_read_locked_inode() now, we know the exact errno
returned for us.

Link: http://lkml.kernel.org/r/1463970656-18413-1-git-send-email-zren@suse.com


Signed-off-by: default avatarEric Ren <zren@suse.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d96c84f8

fs/ocfs2/inode.c

+1 −6
Original line number Diff line number Diff line
@@ -176,12 +176,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags, 
	}

	if (is_bad_inode(inode)) {

		iput(inode);

		if ((flags & OCFS2_FI_FLAG_FILECHECK_CHK) ||

		    (flags & OCFS2_FI_FLAG_FILECHECK_FIX))

			/* Return OCFS2_FILECHECK_ERR_XXX related errno */

		inode = ERR_PTR(rc);

		else

			inode = ERR_PTR(-ESTALE);

		goto bail;

	}