[ltp] Re: hdaps-protect-patch for 2.6.25

[Dmitry E. Mikhailov]

On Thursday 22 May 2008 02:31:53 pm Rolf Kutz wrote:
> On 22/05/08 10:22 +0200, Rolf Kutz wrote:
> > On 22/05/08 09:14 +0600, Dmitry E. Mikhailov wrote:
> >> I got exactly that rc9 patch.
> >> http://www.thinkwiki.org/wiki/HDAPS#Disk_head_parking
> >> And it applied cleanly. The point is it still (even with fix) hanging
> >> my laptop.
> >
> > Then I probably made an error. Will try again.
>
> When trying to patch a fresh 2.6.25 I get:
>
> rk@midori:/usr/src/linux-2.6.25$ patch -p1 --dry-run <
> ../hdaps_protect.2.6.25.rc9.patch patching file
> Documentation/block/disk-protection.txt
> patching file block/blk-core.c
> Hunk #2 FAILED at 522.
> 1 out of 2 hunks FAILED -- saving rejects to file block/blk-core.c.rej
> patching file block/blk-settings.c
> Hunk #1 FAILED at 112.
> 1 out of 2 hunks FAILED -- saving rejects to file block/blk-settings.c.rej
> patching file block/blk-sysfs.c
> Hunk #1 succeeded at 270 with fuzz 1.
> Hunk #2 FAILED at 441.
> Hunk #3 FAILED at 462.
> 2 out of 3 hunks FAILED -- saving rejects to file block/blk-sysfs.c.rej
> patching file block/blk.h
> patching file drivers/ata/libata-scsi.c
> Hunk #1 succeeded at 905 with fuzz 2.
> Hunk #2 FAILED at 959.
> 1 out of 2 hunks FAILED -- saving rejects to file
> drivers/ata/libata-scsi.c.rej patching file drivers/ide/ide-disk.c
> Hunk #2 FAILED at 1019.
> 1 out of 2 hunks FAILED -- saving rejects to file
> drivers/ide/ide-disk.c.rej patching file drivers/ide/ide-io.c
> Hunk #1 FAILED at 1158.
> Hunk #2 FAILED at 1662.
> 2 out of 2 hunks FAILED -- saving rejects to file drivers/ide/ide-io.c.rej
> patching file drivers/scsi/scsi_lib.c
> Hunk #1 FAILED at 2248.
> Hunk #2 succeeded at 2502 with fuzz 1.
> 1 out of 2 hunks FAILED -- saving rejects to file
> drivers/scsi/scsi_lib.c.rej patching file include/linux/ata.h
> Hunk #1 succeeded at 459 with fuzz 2.
> patching file include/linux/blkdev.h
> Hunk #1 succeeded at 260 with fuzz 1.
> Hunk #2 FAILED at 299.
> Hunk #3 FAILED at 316.
> 2 out of 4 hunks FAILED -- saving rejects to file
> include/linux/blkdev.h.rej patching file include/linux/ide.h
> Hunk #1 FAILED at 837.
> 1 out of 1 hunk FAILED -- saving rejects to file include/linux/ide.h.rej
> rk@midori:/usr/src/linux-2.6.25$
>
> Anything I'm missing?
>
> regards, Rolf

are you sure it's the same patches we're talking about?

-rw-r--r-- 1 root root  28955 2008-04-28 15:48 hdaps-protect.patch
-rw-r--r-- 1 root root    815 2008-04-28 15:47 hdaps-workaround.patch

[root@ibm 2.6.25]# md5sum hdaps-*
74649128676a6c42887753183e80f6cf  hdaps-protect.patch
3e45ecaab02b63f7966db0076ac54331  hdaps-workaround.patch

beginning of hdaps-protect.patch

 Documentation/block/disk-protection.txt |   79 ++++++++++++++
 block/blk-core.c                        |   41 +++++++
 block/blk-settings.c                    |   22 ++++
 block/blk-sysfs.c                       |  168 ++++++++++++++++++++++++++++++
 block/blk.h                             |    3 +
 drivers/ata/libata-scsi.c               |   36 +++++++
 drivers/ide/ide-disk.c                  |  145 ++++++++++++++++++++++++++
 drivers/ide/ide-io.c                    |   14 +++
 drivers/scsi/scsi_lib.c                 |  171 
+++++++++++++++++++++++++++++++
 include/linux/ata.h                     |   12 ++
 include/linux/blkdev.h                  |   14 +++
 include/linux/ide.h                     |    1
 12 files changed, 703 insertions(+), 3 deletions(-)

beginning of hdaps-workaround.patch

 drivers/ata/libata-scsi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Best regards, Dmitry