The patch titled
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2
has been removed from the -mm tree. Its filename is
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2
From: Andrew Morton <akpm@xxxxxxxx>
- kfree(NULL) is legal
- Don't "succeed" if register_chrdev() failed - otherwise we'll later
unregister a not-registered chrdev.
- Don't return from hptiop_do_ioctl() with the spinlock held.
- uninline __hpt_do_ioctl() (marginal)
Cc: HighPoint Linux Team <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/hptiop.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff -puN drivers/scsi/hptiop.c~hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2 drivers/scsi/hptiop.c
--- 25/drivers/scsi/hptiop.c~hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2 Fri May 12 09:59:41 2006
+++ 25-akpm/drivers/scsi/hptiop.c Fri May 12 09:59:41 2006
@@ -708,9 +708,9 @@ static void hptiop_ioctl_done(struct hpt
static void hptiop_do_ioctl(struct hpt_ioctl_k *arg)
{
- struct hptiop_hba * hba = arg->hba;
+ struct hptiop_hba *hba = arg->hba;
u32 val;
- struct hpt_iop_request_ioctl_command __iomem * req;
+ struct hpt_iop_request_ioctl_command __iomem *req;
int ioctl_retry = 0;
dprintk("scsi%d: hptiop_do_ioctl\n", hba->host->host_no);
@@ -735,9 +735,10 @@ retry:
val = readl(&hba->iop->inbound_queue);
if (val == IOPMU_QUEUE_EMPTY) {
+ spin_unlock_irq(hba->host->host_lock);
dprintk("scsi%d: no free req for ioctl\n", hba->host->host_no);
arg->result = -1;
- return ;
+ return;
}
req = (struct hpt_iop_request_ioctl_command __iomem *)
@@ -790,9 +791,8 @@ retry:
arg->ioctl_code, arg->result);
}
-static inline int __hpt_do_ioctl(struct hptiop_hba *hba,
- u32 code, void *inbuf, u32 insize,
- void *outbuf, u32 outsize)
+static int __hpt_do_ioctl(struct hptiop_hba *hba, u32 code, void *inbuf,
+ u32 insize, void *outbuf, u32 outsize)
{
struct hpt_ioctl_k arg;
arg.hba = hba;
@@ -944,8 +944,7 @@ static void hptiop_dump_devinfo(struct h
else
hptiop_copy_info(pinfo, "CH%d %s\n",
devinfo.u.device.path_id + 1,
- driveid->model
- );
+ driveid->model);
else {
capacity = devinfo.capacity*512;
do_div(capacity, 1000000);
@@ -1022,7 +1021,7 @@ static ssize_t hptiop_cdev_read(struct f
info.buffer = buf;
info.buflength = count;
- info.bufoffset = ppos? *ppos : 0;
+ info.bufoffset = ppos ? *ppos : 0;
info.filpos = 0;
info.buffillen = 0;
@@ -1136,10 +1135,8 @@ static int hptiop_cdev_ioctl(struct inod
}
err_exit:
- if (ioctl_k.inbuf)
- kfree(ioctl_k.inbuf);
- if (ioctl_k.outbuf)
- kfree(ioctl_k.outbuf);
+ kfree(ioctl_k.inbuf);
+ kfree(ioctl_k.outbuf);
return err;
}
@@ -1497,8 +1494,10 @@ static int __init hptiop_module_init(voi
return error;
hptiop_cdev_major = register_chrdev(0, "hptiop", &hptiop_cdev_fops);
- if (hptiop_cdev_major < 0)
+ if (hptiop_cdev_major < 0) {
printk(KERN_WARNING "unable to register hptiop device.\n");
+ return hptiop_cdev_major;
+ }
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
ext3-resize-fix-double-unlock_super.patch
tpm-more-bios-log-parsing-fixes-tidy.patch
revert-swsusp-add-check-for-suspension-of-x-controlled-devices.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
git-libata-all-data_xfer-fixes.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
bogus-disk-geometry-on-large-disks-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
driver-for-apple-cinema-display-tweaks.patch
git-supertrak-fixup.patch
x86_64-reliable-stack-trace-support-i386-fix.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
page-migration-simplify-migrate_pages-tweaks.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
keys-fix-race-between-two-instantiators-of-a-key-tidy.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
