lkml.org 
[lkml]   [2017]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 07/81] xfs: fail _dir_open when readahead fails
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Darrick J. Wong <darrick.wong@oracle.com>

    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>

    ---
    fs/xfs/libxfs/xfs_da_btree.c | 6 ++----
    fs/xfs/libxfs/xfs_da_btree.h | 2 +-
    fs/xfs/xfs_file.c | 4 ++--
    3 files changed, 5 insertions(+), 7 deletions(-)

    --- a/fs/xfs/libxfs/xfs_da_btree.c
    +++ b/fs/xfs/libxfs/xfs_da_btree.c
    @@ -2633,7 +2633,7 @@ out_free:
    /*
    * 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 @@ out_free:
    if (mapp != &map)
    kmem_free(mapp);

    - if (error)
    - return -1;
    - return mappedbno;
    + return error;
    }
    --- a/fs/xfs/libxfs/xfs_da_btree.h
    +++ b/fs/xfs/libxfs/xfs_da_btree.h
    @@ -201,7 +201,7 @@ int xfs_da_read_buf(struct xfs_trans *tr
    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,
    --- a/fs/xfs/xfs_file.c
    +++ b/fs/xfs/xfs_file.c
    @@ -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

    \
     
     \ /
      Last update: 2017-04-06 11:04    [W:4.075 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site