lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 044/260] ocfs2: Fix incorrect checksum validation error
    Date
    From: Sunil Mushran <sunil.mushran@oracle.com>

    commit f5ce5a08a40f2086435858ddc80cb40394b082eb upstream.

    For local mounts, ocfs2_read_locked_inode() calls ocfs2_read_blocks_sync() to
    read the inode off the disk. The latter first checks to see if that block is
    cached in the journal, and, if so, returns that block. That is ok.

    But ocfs2_read_locked_inode() goes wrong when it tries to validate the checksum
    of such blocks. Blocks that are cached in the journal may not have had their
    checksum computed as yet. We should not validate the checksums of such blocks.

    Fixes ossbz#1282
    http://oss.oracle.com/bugzilla/show_bug.cgi?id=1282

    Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
    Singed-off-by: Tao Ma <tao.ma@oracle.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    fs/ocfs2/inode.c | 6 +++++-
    1 files changed, 5 insertions(+), 1 deletions(-)

    diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
    index af18988..bbecb19 100644
    --- a/fs/ocfs2/inode.c
    +++ b/fs/ocfs2/inode.c
    @@ -484,7 +484,11 @@ static int ocfs2_read_locked_inode(struct inode *inode,
    OCFS2_BH_IGNORE_CACHE);
    } else {
    status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
    - if (!status)
    + /*
    + * If buffer is in jbd, then its checksum may not have been
    + * computed as yet.
    + */
    + if (!status && !buffer_jbd(bh))
    status = ocfs2_validate_inode_block(osb->sb, bh);
    }
    if (status < 0) {
    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 09:11    [W:0.031 / U:29.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site