xfs
[Top] [All Lists]

TAKE - fix a bad merge from irix

To: linux-xfs@xxxxxxxxxxx
Subject: TAKE - fix a bad merge from irix
From: Steve Lord <lord@xxxxxxx>
Date: Wed, 26 Feb 2003 11:50:16 -0600
Sender: linux-xfs-bounce@xxxxxxxxxxx
This went in yesterday, should have looked harder at what
the merge tool did to the code, it replaced the wrong line
in here.


Date:  Wed Feb 26 09:49:07 PST 2003
Workarea:  jen.americas.sgi.com:/src/lord/xfs-linux.2.4

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs


Modid:  2.4.x-xfs:slinx:140375a
linux/fs/xfs/xfs_log_recover.c - 1.256
        - put back error=0 and remove the xfs_inobp_check()



<Prev in Thread] Current Thread [Next in Thread>
  • TAKE - fix a bad merge from irix, Steve Lord <=