diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-02-02 15:13:58 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-08 09:30:30 +0200 |
| commit | 7e2dd1fb71020e12b60a886b06f2b7fe8c465eaa (patch) | |
| tree | fa515b7b0e3320e4047ffe92f4fe7609a3632ce9 /fs/xfs/xfs_file.c | |
| parent | 0a6844abacc1adf428f80ad1b4b1f4cce915d2b2 (diff) | |
| download | linux-stable-7e2dd1fb71020e12b60a886b06f2b7fe8c465eaa.tar.gz linux-stable-7e2dd1fb71020e12b60a886b06f2b7fe8c465eaa.tar.bz2 linux-stable-7e2dd1fb71020e12b60a886b06f2b7fe8c465eaa.zip | |
xfs: fail _dir_open when readahead fails
commit 7a652bbe366464267190c2792a32ce4fff5595ef upstream.
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: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 81b7fee40b54..780be7a7abe9 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -992,9 +992,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 |