Linux 2.6.27.51
Subsystems (11)
I'm announcing the release of the 2.6.27.51 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 - arch/x86/xen/enlighten.c | 2 - arch/x86/xen/time.c | 43 ----------------------- arch/x86/xen/xen-ops.h | 3 + drivers/char/nvram.c | 14 +++++-- drivers/md/raid10.c | 18 +++++++++ drivers/pci/quirks.c | 1 fs/ecryptfs/file.c | 60 +++++++++++++++++++------------- fs/jfs/xattr.c | 87 ++++++++++++++++++++--------------------------- fs/signalfd.c | 2 + fs/splice.c | 12 ------ mm/backing-dev.c | 3 + 12 files changed, 115 insertions(+), 132 deletions(-)
Andrew Morton (1):
mm/backing-dev.c: remove recently-added WARN_ON()
Dave Kleikamp (1):
jfs: don't allow os2 xattr namespace overlap with others
Greg Kroah-Hartman (1):
Linux 2.6.27.51
H. Peter Anvin (1):
nvram: Fix write beyond end condition; prove to gcc copy is safe
Jeremy Fitzhardinge (1):
xen: drop xen_sched_clock in favour of using plain wallclock time
Julia Lawall (1):
fs/ecryptfs/file.c: introduce missing free
Kay Sievers (1):
bdi: register sysfs bdi device only once per queue
Miklos Szeredi (1):
splice: fix misuse of SPLICE_F_NONBLOCK
Nathan Lynch (1):
signalfd: fill in ssi_int for posix timers and message queues
NeilBrown (1):
md/raid10: fix deadlock with unaligned read during resync
Tejun Heo (1):
PCI: disable MSI on VIA K8M800
Tyler Hicks (1):
eCryptfs: Handle ioctl calls with unlocked and compat functions
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .50 +EXTRAVERSION = .51 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/x86/xen/enlighten.c +1 -1
@@ -1179,7 +1179,7 @@ static const struct pv_time_ops xen_time_ops __initdata = { .set_wallclock = xen_set_wallclock, .get_wallclock = xen_get_wallclock, .get_tsc_khz = xen_tsc_khz, - .sched_clock = xen_sched_clock, + .sched_clock = xen_clocksource_read, };static const struct pv_cpu_ops xen_cpu_ops__initdata = {
arch/x86/xen/time.c +1 -42
61 lines not on this page · raw message
arch/x86/xen/xen-ops.h +2 -1
@@ -3,6 +3,7 @@#include <linux/init.h> #include <linux/irqreturn.h> +#include <linux/clocksource.h> #include <xen/xen-ops.h> /* These are code, but not functions. Defined in entry.S */
@@ -37,7 +38,7 @@ unsigned long xen_tsc_khz(void);void __init xen_time_init (void );unsigned long xen_get_wallclock (void );int xen_set_wallclock (unsigned long time); -unsigned long long xen_sched_clock (void ); +cycle_t xen_clocksource_read (void );irqreturn_t xen_debug_interrupt (int irq,void *dev_id);
drivers/char/nvram.c +10 -4
@@ -265,10 +265,16 @@ nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppounsigned char contents[NVRAM_BYTES ];unsigned i = *ppos;unsigned char *tmp; -int len; - len = (NVRAM_BYTES - i) < count ? (NVRAM_BYTES - i) : count; -if (copy_from_user (contents, buf, len)) +if (i >=NVRAM_BYTES ) +return 0 ;/* Past EOF */ + +if (count >NVRAM_BYTES - i) + count =NVRAM_BYTES - i; +if (count >NVRAM_BYTES ) +return -EFAULT ;/* Can't happen, but prove it to gcc */ + +if (copy_from_user (contents, buf, count))return -EFAULT ;spin_lock_irq (&rtc_lock);
@@ -276,7 +282,7 @@ nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppoif (!__nvram_check_checksum ()) goto checksum_err; -for (tmp = contents; count-- >0 && i <NVRAM_BYTES ; ++i, ++tmp) +for (tmp = contents; count--; ++i, ++tmp)__nvram_write_byte (*tmp, i);__nvram_set_checksum ();
drivers/md/raid10.c +18 -0
@@ -818,11 +818,29 @@ static int make_request(struct request_queue *q, struct bio * bio)*/ bp =bio_split (bio, bio_split_pool, chunk_sects - (bio->bi_sector & (chunk_sects -1 )) ); + +/* Each of these 'make_request' calls will call 'wait_barrier'. +* If the first succeeds but the second blocks due to the resync +* thread raising the barrier, we will deadlock because the +* IO to the underlying device will be queued in generic_make_request +* and will never complete, so will never reduce nr_pending. +* So increment nr_waiting here so no new raise_barriers will +* succeed, and so the second wait_barrier cannot block. +*/ +spin_lock_irq (&conf->resync_lock); + conf->nr_waiting++; +spin_unlock_irq (&conf->resync_lock); +if (make_request (q, &bp->bio1))generic_make_request (&bp->bio1);if (make_request (q, &bp->bio2))generic_make_request (&bp->bio2); +spin_lock_irq (&conf->resync_lock); + conf->nr_waiting--; +wake_up (&conf->wait_barrier); +spin_unlock_irq (&conf->resync_lock); +bio_pair_release (bp);return 0 ; bad_map:
drivers/pci/quirks.c +1 -0
@@ -1833,6 +1833,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disablDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_VT3336 , quirk_disable_all_msi);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_VT3351 , quirk_disable_all_msi);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_VT3364 , quirk_disable_all_msi); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8380_0 , quirk_disable_all_msi);/* Disable MSI on chipsets that are known to not support it */ static void __devinit quirk_disable_msi (struct pci_dev *dev)
fs/ecryptfs/file.c +37 -23
90 lines not on this page · raw message
fs/jfs/xattr.c +38 -49
130 lines not on this page · raw message
fs/signalfd.c +2 -0
@@ -87,6 +87,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, err |=__put_user (kinfo->si_tid, &uinfo->ssi_tid); err |=__put_user (kinfo->si_overrun, &uinfo->ssi_overrun); err |=__put_user ((long ) kinfo->si_ptr, &uinfo->ssi_ptr); + err |=__put_user (kinfo->si_int, &uinfo->ssi_int);break ;case __SI_POLL: err |=__put_user (kinfo->si_band, &uinfo->ssi_band);
@@ -110,6 +111,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, err |=__put_user (kinfo->si_pid, &uinfo->ssi_pid); err |=__put_user (kinfo->si_uid, &uinfo->ssi_uid); err |=__put_user ((long ) kinfo->si_ptr, &uinfo->ssi_ptr); + err |=__put_user (kinfo->si_int, &uinfo->ssi_int);break ;default :/*
fs/splice.c +1 -11
@@ -366,17 +366,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,* If the page isn't uptodate, we may need to start io on it */ if (!PageUptodate (page)) { -/* -* If in nonblock mode then dont block on waiting -* for an in-flight io page -*/ -if (flags &SPLICE_F_NONBLOCK ) { -if (!trylock_page (page)) { - error = -EAGAIN ; -break ; - } - }else -lock_page (page); +lock_page (page);/* * Page was truncated, or invalidated by the
mm/backing-dev.c +3 -0
@@ -176,6 +176,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,int ret =0 ;struct device *dev; +if (bdi->dev)/* The driver needs to use separate queues per device */ + goto exit; +va_start (args, fmt); dev =device_create_vargs (bdi_class, parent,MKDEV (0 ,0 ), bdi, fmt, args);va_end (args);