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

Commit 7a652bbe authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: fail _dir_open when readahead fails 



When we open a directory, we try to readahead block 0 of the directory
on the assumption that we're going to need it soon.  If the bmbt is
corrupt, the directory will never be usable and the readahead fails
immediately, so we might as well prevent the directory from being opened
at all.  This prevents a subsequent read or modify operation from
hitting it and taking the fs offline.

NOTE: We're only checking for early failures in the block mapping, not
the readahead directory block itself.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4b5bd5bf

fs/xfs/libxfs/xfs_da_btree.c

+2 −4
Original line number Diff line number Diff line
@@ -2633,7 +2633,7 @@ xfs_da_read_buf( 
/*

 * Readahead the dir/attr block.

 */

xfs_daddr_t

int

xfs_da_reada_buf(

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,
@@ -2664,7 +2664,5 @@ xfs_da_reada_buf( 
	if (mapp != &map)

		kmem_free(mapp);



	if (error)

		return -1;

	return mappedbno;

	return error;

}

fs/xfs/libxfs/xfs_da_btree.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp, 
			       xfs_dablk_t bno, xfs_daddr_t mappedbno,

			       struct xfs_buf **bpp, int whichfork,

			       const struct xfs_buf_ops *ops);

xfs_daddr_t	xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno,

int	xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno,

				xfs_daddr_t mapped_bno, int whichfork,

				const struct xfs_buf_ops *ops);

int	xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,

fs/xfs/xfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -913,9 +913,9 @@ xfs_dir_open( 
	 */

	mode = xfs_ilock_data_map_shared(ip);

	if (ip->i_d.di_nextents > 0)

		xfs_dir3_data_readahead(ip, 0, -1);

		error = xfs_dir3_data_readahead(ip, 0, -1);

	xfs_iunlock(ip, mode);

	return 0;

	return error;

}



STATIC int