Re: xfs + rmap?

["Adam McKenna" <adam-dated-1013035813.5cd484@flounder.net>]

On Fri, Feb 01, 2002 at 04:52:30PM -0600, Austin Gonyou wrote:
> I'd be happy to help you out. I'm looking to test both -aa and rmap. 
> 
> what is your current procedure for merging this?

Right now I just applied both patches and I am looking at the .rej files.

Currently, here are the issues I'm seeing -- I'm using the 2.4.17 snapshot
from ftp://oss.sgi.com/projects/xfs/download/patches/2.4.17/.

issue 1 - fs/buffer.c:

current code:

        __mark_buffer_clean(bh);
        get_bh(bh);
        set_bit(BH_launder, &bh->b_state);
        tryagain = write_buffer_locked(bh) == 0;
    } while ((bh = bh->b_this_page) != head);

    return tryagain;
}

.rej file:

***************
*** 2533,2542 ****
        set_bit(BH_launder, &bh->b_state);
        bh->b_end_io = end_buffer_io_sync;
        submit_bh(WRITE, bh);
-       tryagain = 0;
    } while ((bh = bh->b_this_page) != head);

-   return tryagain;
  }

  /*
--- 2525,2533 ----
        set_bit(BH_launder, &bh->b_state);
        bh->b_end_io = end_buffer_io_sync;
        submit_bh(WRITE, bh);
    } while ((bh = bh->b_this_page) != head);

+   return;
  }

  /*

issue 2 - vmscan.c - see http://flounder.net/vmscan.c.rej for the .rej file.

The only other rejections are in Makefile and include/linux/sysctl.h and are
both easily fixed.  Some patches did apply with a fuzz, I didn't look at them
though.  I haven't tried building the source yet.

--Adam

-- 
Adam McKenna <adam@flounder.net>   | GPG: 17A4 11F7 5E7E C2E7 08AA
http://flounder.net/publickey.html |      38B0 05D0 8BF7 2C6D 110A