lkml.org 
[lkml]   [2009]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] writeback: cleanup writeback_single_inode()
    Date
    From: Wu Fengguang <fengguang.wu@intel.com>

    Make the if-else straight in writeback_single_inode().
    No behavior change.

    Cc: Jan Kara <jack@suse.cz>
    Cc: Michael Rubin <mrubin@google.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    ---
    fs/fs-writeback.c | 15 +++++++--------
    1 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
    index 551684d..916e834 100644
    --- a/fs/fs-writeback.c
    +++ b/fs/fs-writeback.c
    @@ -449,8 +449,13 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
    spin_lock(&inode_lock);
    inode->i_state &= ~I_SYNC;
    if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
    - if (!(inode->i_state & I_DIRTY) &&
    - mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
    + if (inode->i_state & I_DIRTY) {
    + /*
    + * Someone redirtied the inode while were writing back
    + * the pages.
    + */
    + redirty_tail(inode);
    + } else if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
    /*
    * We didn't write back all the pages. nfs_writepages()
    * sometimes bales out without doing anything. Redirty
    @@ -494,12 +499,6 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
    inode->i_state |= I_DIRTY_PAGES;
    redirty_tail(inode);
    }
    - } else if (inode->i_state & I_DIRTY) {
    - /*
    - * Someone redirtied the inode while were writing back
    - * the pages.
    - */
    - redirty_tail(inode);
    } else if (atomic_read(&inode->i_count)) {
    /*
    * The inode is clean, inuse
    --
    1.6.4.1.207.g68ea


    \
     
     \ /
      Last update: 2009-09-24 17:15    [W:0.021 / U:333.144 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site