From: Greg Kroah-Hartman Date: Tue, 13 Dec 2005 07:33:52 +0000 (-0800) Subject: more patches queued X-Git-Tag: v2.6.14.4~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=372815d8ba55442679a4b8c157dd8a3c6d5643a3;p=thirdparty%2Fkernel%2Fstable-queue.git more patches queued --- diff --git a/queue/add-try_to_freeze-to-kauditd.patch b/queue/add-try_to_freeze-to-kauditd.patch new file mode 100644 index 00000000000..b25281fe894 --- /dev/null +++ b/queue/add-try_to_freeze-to-kauditd.patch @@ -0,0 +1,40 @@ +From stable-bounces@linux.kernel.org Mon Dec 12 12:32:49 2005 +Date: Mon, 12 Dec 2005 10:03:35 -0800 +Message-Id: <200512121803.jBCI3Ze6006729@hera.kernel.org> +From: Linux Kernel Mailing List +To: git-commits-head@vger.kernel.org +Cc: +Subject: Add try_to_freeze to kauditd + +From: Pierre Ossman + +kauditd was causing suspends to fail because it refused to freeze. Adding +a try_to_freeze() to its sleep loop solves the issue. + +Signed-off-by: Pierre Ossman +Acked-by: Pavel Machek +Cc: David Woodhouse +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +diff --git a/kernel/audit.c b/kernel/audit.c +index 0c56320..32fa03a 100644 +--- + kernel/audit.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- linux-2.6.14.3.orig/kernel/audit.c ++++ linux-2.6.14.3/kernel/audit.c +@@ -291,8 +291,10 @@ int kauditd_thread(void *dummy) + set_current_state(TASK_INTERRUPTIBLE); + add_wait_queue(&kauditd_wait, &wait); + +- if (!skb_queue_len(&audit_skb_queue)) ++ if (!skb_queue_len(&audit_skb_queue)) { ++ try_to_freeze(); + schedule(); ++ } + + __set_current_state(TASK_RUNNING); + remove_wait_queue(&kauditd_wait, &wait); diff --git a/queue/cciss-bug-fix-for-big_pass_thru.patch b/queue/cciss-bug-fix-for-big_pass_thru.patch new file mode 100644 index 00000000000..329a1cb09b2 --- /dev/null +++ b/queue/cciss-bug-fix-for-big_pass_thru.patch @@ -0,0 +1,41 @@ +From stable-bounces@linux.kernel.org Mon Dec 12 12:32:44 2005 +Date: Fri, 18 Nov 2005 14:02:54 -0800 +Message-Id: <200511182202.jAIM2sSF008196@hera.kernel.org> +From: Linux Kernel Mailing List +To: git-commits-head@vger.kernel.org +Cc: +Subject: cciss: bug fix for BIG_PASS_THRU + +From: Jens Axboe + +Applications using CCISS_BIG_PASSTHRU complained that the data written +was zeros. The problem is that the buffer is being cleared after the +user copy, unless the user copy has failed... Correct that logic. + +Signed-off-by: Mike Miller +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c +index e239a6c..33f8341 100644 +--- + drivers/block/cciss.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- linux-2.6.14.3.orig/drivers/block/cciss.c ++++ linux-2.6.14.3/drivers/block/cciss.c +@@ -1016,10 +1016,11 @@ static int cciss_ioctl(struct inode *ino + status = -ENOMEM; + goto cleanup1; + } +- if (ioc->Request.Type.Direction == XFER_WRITE && +- copy_from_user(buff[sg_used], data_ptr, sz)) { ++ if (ioc->Request.Type.Direction == XFER_WRITE) { ++ if (copy_from_user(buff[sg_used], data_ptr, sz)) { + status = -ENOMEM; +- goto cleanup1; ++ goto cleanup1; ++ } + } else { + memset(buff[sg_used], 0, sz); + } diff --git a/queue/cciss-bug-fix-for-hpacucli.patch b/queue/cciss-bug-fix-for-hpacucli.patch new file mode 100644 index 00000000000..f5ef6a373cc --- /dev/null +++ b/queue/cciss-bug-fix-for-hpacucli.patch @@ -0,0 +1,40 @@ +From stable-bounces@linux.kernel.org Mon Dec 12 12:32:41 2005 +Date: Fri, 18 Nov 2005 14:02:54 -0800 +Message-Id: <200511182202.jAIM2s8e008191@hera.kernel.org> +From: Linux Kernel Mailing List +To: git-commits-head@vger.kernel.org +Cc: +Subject: cciss: bug fix for hpacucli + +From Mike Miller + +This patch fixes a bug that breaks hpacucli, a command line interface +for the HP Array Config Utility. Without this fix the utility will +not detect any controllers in the system. I thought I had already fixed +this, but I guess not. + +Thanks to all who reported the issue. Please consider this this inclusion. + +Signed-off-by: Mike Miller +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + + +diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h +index 424d5e6..6e27f42 100644 +--- + include/linux/cciss_ioctl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.14.3.orig/include/linux/cciss_ioctl.h ++++ linux-2.6.14.3/include/linux/cciss_ioctl.h +@@ -10,8 +10,8 @@ + typedef struct _cciss_pci_info_struct + { + unsigned char bus; +- unsigned short domain; + unsigned char dev_fn; ++ unsigned short domain; + __u32 board_id; + } cciss_pci_info_struct; + diff --git a/queue/ide-floppy-software-eject-not-working-with-ls-120-drive.patch b/queue/ide-floppy-software-eject-not-working-with-ls-120-drive.patch new file mode 100644 index 00000000000..efc38eb95dc --- /dev/null +++ b/queue/ide-floppy-software-eject-not-working-with-ls-120-drive.patch @@ -0,0 +1,53 @@ +From stable-bounces@linux.kernel.org Mon Dec 12 12:32:46 2005 +Date: Wed, 9 Nov 2005 21:02:07 -0800 +Message-Id: <200511100502.jAA527xg006881@hera.kernel.org> +From: Linux Kernel Mailing List +To: git-commits-head@vger.kernel.org +Cc: +Subject: ide-floppy: software eject not working with LS-120 drive + +From: Ondrej Zary + +The problem (eject not working on ATAPI LS-120 drive) is caused by +idefloppy_ioctl() function which *first* tries generic_ide_ioctl() +and *only* if it fails with -EINVAL, proceeds with the specific ioctls. +The generic eject command fails with something other than -EINVAL +and the specific one is never executed. + +This patch fixes it by first going through the internal ioctls +and only trying generic_ide_ioctl() if none of them matches. + +Signed-off-by: Ondrej Zary +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Greg Kroah-Hartman + +diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c +index e83f54d..f615ab7 100644 +--- + drivers/ide/ide-floppy.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- linux-2.6.14.3.orig/drivers/ide/ide-floppy.c ++++ linux-2.6.14.3/drivers/ide/ide-floppy.c +@@ -2038,11 +2038,9 @@ static int idefloppy_ioctl(struct inode + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk); + ide_drive_t *drive = floppy->drive; + void __user *argp = (void __user *)arg; +- int err = generic_ide_ioctl(drive, file, bdev, cmd, arg); ++ int err; + int prevent = (arg) ? 1 : 0; + idefloppy_pc_t pc; +- if (err != -EINVAL) +- return err; + + switch (cmd) { + case CDROMEJECT: +@@ -2094,7 +2092,7 @@ static int idefloppy_ioctl(struct inode + case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS: + return idefloppy_get_format_progress(drive, argp); + } +- return -EINVAL; ++ return generic_ide_ioctl(drive, file, bdev, cmd, arg); + } + + static int idefloppy_media_changed(struct gendisk *disk) diff --git a/queue/series b/queue/series index 494c9892a04..2f3c37f76bf 100644 --- a/queue/series +++ b/queue/series @@ -20,3 +20,7 @@ bonding-fix-feature-consolidation.patch recompute-features-when-adding-a-new-device.patch locking-rewrite.patch i8k-fix-proc-reporting-of-blank-service-tags.patch +ide-floppy-software-eject-not-working-with-ls-120-drive.patch +cciss-bug-fix-for-hpacucli.patch +cciss-bug-fix-for-big_pass_thru.patch +add-try_to_freeze-to-kauditd.patch