[patch 00/48] 2.6.27.32-stable review

[patch 00/48] 2.6.27.32-stable review

[Greg KH]

This is the start of the stable review cycle for the 2.6.27.32 release.
There are 48 patches in this series, all will be posted as a response to
this one.  If anyone has any issues with these being applied, please let
us know.  If anyone is a maintainer of the proper subsystem, and wants
to add a Signed-off-by: line to the patch, please respond with it.

These patches are sent out with a number of different people on the Cc:
line.  If you wish to be a reviewer, please email stable@kernel.org to
add your name to the list.  If you want to be off the reviewer list,
also email us.

Responses should be made by Sunday, Sept 6, 20:00:00 UTC.  Anything
received after that time might be too late.

The whole patch series can be found in one patch at:
	kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.27.32-rc1.gz
and the diffstat can be found below.


thanks,

greg k-h

---------

 Makefile                              |    2 +-
 arch/x86/kvm/mmu.c                    |   63 ++++++++-------
 arch/x86/kvm/svm.c                    |    1 -
 arch/x86/kvm/vmx.c                    |   25 +++++-
 arch/x86/kvm/vmx.h                    |    1 +
 arch/x86/kvm/x86.c                    |  146 +++++++++++++++++++++++----------
 drivers/char/mxser.c                  |    2 -
 drivers/char/nozomi.c                 |    1 -
 drivers/net/ehea/ehea_main.c          |    3 +
 drivers/parport/share.c               |   13 ++-
 drivers/scsi/sr_ioctl.c               |    5 +
 drivers/usb/serial/cyberjack.c        |    7 --
 drivers/usb/serial/cypress_m8.c       |    4 -
 drivers/usb/serial/empeg.c            |    6 --
 drivers/usb/serial/garmin_gps.c       |    8 --
 drivers/usb/serial/generic.c          |    6 --
 drivers/usb/serial/io_edgeport.c      |    8 --
 drivers/usb/serial/io_ti.c            |    8 --
 drivers/usb/serial/ipaq.c             |    6 --
 drivers/usb/serial/ipw.c              |    3 -
 drivers/usb/serial/iuu_phoenix.c      |    1 -
 drivers/usb/serial/kobil_sct.c        |    6 --
 drivers/usb/serial/mos7720.c          |    7 --
 drivers/usb/serial/mos7840.c          |    6 --
 drivers/usb/serial/option.c           |    3 -
 drivers/usb/serial/sierra.c           |    3 -
 drivers/usb/serial/ti_usb_3410_5052.c |   17 +----
 drivers/usb/serial/visor.c            |    8 --
 fs/ocfs2/aops.c                       |   64 ++++++++++----
 include/asm-x86/kvm_host.h            |   10 ++
 include/linux/parport.h               |    4 +
 include/linux/sunrpc/xprt.h           |    1 +
 kernel/fork.c                         |   21 ++----
 kernel/kthread.c                      |    2 +-
 kernel/signal.c                       |   15 ++--
 net/appletalk/ddp.c                   |    1 +
 net/can/raw.c                         |    1 +
 net/econet/af_econet.c                |    1 +
 net/irda/af_irda.c                    |    1 +
 net/llc/af_llc.c                      |    1 +
 net/netrom/af_netrom.c                |    1 +
 net/rose/af_rose.c                    |    1 +
 net/sunrpc/clnt.c                     |    1 +
 net/sunrpc/xprt.c                     |    6 +-
 net/sunrpc/xprtsock.c                 |   37 ++++++++-
 sound/core/pcm_lib.c                  |   39 ++-------
 sound/pci/hda/patch_realtek.c         |   36 +++++---
 virt/kvm/kvm_main.c                   |   57 ++++++++-----
 48 files changed, 362 insertions(+), 307 deletions(-)

Re: [patch 00/48] 2.6.27.32-stable review

[Tilman Schmidt]

[-- Attachment #1: Type: text/plain, Size: 2958 bytes --]

Greg,

if at all possible, could you please include the patch below, with an

Acked-by: Tilman Schmidt <tilman@imap.cc>

tacked on? It applies fine to 2.6.27.31.

Thanks a lot in advance,
Tilman

---- original message follows ----
Message-ID: <4A9524BE.3060508@canonical.com>
Date: Wed, 26 Aug 2009 14:04:14 +0200
From: Stefan Bader <stefan.bader@canonical.com>
To: stable@kernel.org
CC: Tilman Schmidt <tilman@imap.cc>, 
 "David S. Miller" <davem@davemloft.net>,
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH] Fix incorrect stable backport to bas_gigaset patch

This seems to affect 2.6.27.y and (discontinued) 2.6.28.y. Some code went into 
gigaset_probe instead of gigaset_initcshw causing an oops when the hardware is 
probed.
[I added one pr_err statement from upstream, too)

-Stefan

From 944fd2dab4173cea4fdcd50732529639ec00cf5d Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Tue, 25 Aug 2009 17:35:56 +0200
Subject: [PATCH] UBUNTU: SAUCE: Fix incorrect stable backport to bas_gigaset

BugLink: http://bugs.launchpad.net/bugs/417732

commit 56f7efe48d57dda9e59e23ab161c118271cce815
Author: Tilman Schmidt <tilman@imap.cc>
Date:   Wed Apr 15 03:25:43 2009 -0700

    bas_gigaset: correctly allocate USB interrupt transfer buffer

    [ Upstream commit 170ebf85160dd128e1c4206cc197cce7d1424705 ]

This incorrect backport to 2.6.28.10 placed some code into the probe function
which used a pointer before it was initialized. Moving this to the correct
place (as it is in upstream).

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 drivers/isdn/gigaset/bas-gigaset.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index fcec2df..3990eae 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2140,8 +2140,16 @@ static int gigaset_initcshw(struct cardstate *cs)
 	struct bas_cardstate *ucs;
 
 	cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
-	if (!ucs)
+	if (!ucs) {
+		pr_err("out of memory\n");
+		return 0;
+	}
+	ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
+	if (!ucs->int_in_buf) {
+		kfree(ucs);
+		pr_err("out of memory\n");
 		return 0;
+	}
 
 	ucs->urb_cmd_in = NULL;
 	ucs->urb_cmd_out = NULL;
@@ -2236,12 +2244,6 @@ static int gigaset_probe(struct usb_interface *interface,
 		}
 		hostif = interface->cur_altsetting;
 	}
-	ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
-	if (!ucs->int_in_buf) {
-		kfree(ucs);
-		pr_err("out of memory\n");
-		return 0;
-	}
 
 	/* Reject application specific interfaces
 	 */
-- 
1.5.4.3

-- 
Tilman Schmidt                    E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]

Re: [patch 00/48] 2.6.27.32-stable review

[Jayson King]

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

Greetings,

Patch 41/48 (ocfs2: Initialize the...) of this series causes a build 
failure:

fs/ocfs2/aops.c: In function ‘ocfs2_write_cluster’:
fs/ocfs2/aops.c:1286: error: ‘should_zero’ undeclared (first use in this 
function)
fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported 
only once
fs/ocfs2/aops.c:1286: error: for each function it appears in.)
fs/ocfs2/aops.c: In function ‘ocfs2_write_cluster_by_desc’:
fs/ocfs2/aops.c:1360: warning: passing argument 4 of 
‘ocfs2_write_cluster’ makes pointer from integer without a cast
fs/ocfs2/aops.c:1360: warning: passing argument 6 of 
‘ocfs2_write_cluster’ from incompatible pointer type
fs/ocfs2/aops.c:1360: warning: passing argument 7 of 
‘ocfs2_write_cluster’ makes integer from pointer without a cast
fs/ocfs2/aops.c:1360: error: too many arguments to function 
‘ocfs2_write_cluster’


A line from the upstream patch is missing in this patch:

  static int ocfs2_write_cluster(struct address_space *mapping,
                     u32 phys, unsigned int unwritten,
+                   unsigned int should_zero,
                     struct ocfs2_alloc_context *data_ac,
                     struct ocfs2_alloc_context *meta_ac,
                     struct ocfs2_write_ctxt *wc, u32 cpos,
                     loff_t user_pos, unsigned user_len)


Attached is the corrected patch with the above line placed back in.

Thanks

Jayson R. King

[-- Attachment #2: aops-new.patch --]
[-- Type: text/plain, Size: 5455 bytes --]

From: Sunil Mushran <sunil.mushran@oracle.com>

commit e7432675f8ca868a4af365759a8d4c3779a3d922 upstream.

In a non-sparse extend, we correctly allocate (and zero) the clusters between
the old_i_size and pos, but we don't zero the portions of the cluster we're
writing to outside of pos<->len.

It handles clustersize > pagesize and blocksize < pagesize.

[Cleaned up by Joel Becker.]

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>

---
 fs/ocfs2/aops.c |   66 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 19 deletions(-)

--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -908,18 +908,17 @@ struct ocfs2_write_cluster_desc {
 	 */
 	unsigned	c_new;
 	unsigned	c_unwritten;
+	unsigned	c_needs_zero;
 };
 
-static inline int ocfs2_should_zero_cluster(struct ocfs2_write_cluster_desc *d)
-{
-	return d->c_new || d->c_unwritten;
-}
-
 struct ocfs2_write_ctxt {
 	/* Logical cluster position / len of write */
 	u32				w_cpos;
 	u32				w_clen;
 
+	/* First cluster allocated in a nonsparse extend */
+	u32				w_first_new_cpos;
+
 	struct ocfs2_write_cluster_desc	w_desc[OCFS2_MAX_CLUSTERS_PER_PAGE];
 
 	/*
@@ -997,6 +996,7 @@ static int ocfs2_alloc_write_ctxt(struct
 		return -ENOMEM;
 
 	wc->w_cpos = pos >> osb->s_clustersize_bits;
+	wc->w_first_new_cpos = UINT_MAX;
 	cend = (pos + len - 1) >> osb->s_clustersize_bits;
 	wc->w_clen = cend - wc->w_cpos + 1;
 	get_bh(di_bh);
@@ -1234,19 +1234,17 @@ out:
  */
 static int ocfs2_write_cluster(struct address_space *mapping,
 			       u32 phys, unsigned int unwritten,
+			       unsigned int should_zero,
 			       struct ocfs2_alloc_context *data_ac,
 			       struct ocfs2_alloc_context *meta_ac,
 			       struct ocfs2_write_ctxt *wc, u32 cpos,
 			       loff_t user_pos, unsigned user_len)
 {
-	int ret, i, new, should_zero = 0;
+	int ret, i, new;
 	u64 v_blkno, p_blkno;
 	struct inode *inode = mapping->host;
 
 	new = phys == 0 ? 1 : 0;
-	if (new || unwritten)
-		should_zero = 1;
-
 	if (new) {
 		u32 tmp_pos;
 
@@ -1356,7 +1354,9 @@ static int ocfs2_write_cluster_by_desc(s
 			local_len = osb->s_clustersize - cluster_off;
 
 		ret = ocfs2_write_cluster(mapping, desc->c_phys,
-					  desc->c_unwritten, data_ac, meta_ac,
+					  desc->c_unwritten,
+					  desc->c_needs_zero,
+					  data_ac, meta_ac,
 					  wc, desc->c_cpos, pos, local_len);
 		if (ret) {
 			mlog_errno(ret);
@@ -1406,14 +1406,14 @@ static void ocfs2_set_target_boundaries(
 		 * newly allocated cluster.
 		 */
 		desc = &wc->w_desc[0];
-		if (ocfs2_should_zero_cluster(desc))
+		if (desc->c_needs_zero)
 			ocfs2_figure_cluster_boundaries(osb,
 							desc->c_cpos,
 							&wc->w_target_from,
 							NULL);
 
 		desc = &wc->w_desc[wc->w_clen - 1];
-		if (ocfs2_should_zero_cluster(desc))
+		if (desc->c_needs_zero)
 			ocfs2_figure_cluster_boundaries(osb,
 							desc->c_cpos,
 							NULL,
@@ -1481,13 +1481,28 @@ static int ocfs2_populate_write_desc(str
 			phys++;
 		}
 
+		/*
+		 * If w_first_new_cpos is < UINT_MAX, we have a non-sparse
+		 * file that got extended.  w_first_new_cpos tells us
+		 * where the newly allocated clusters are so we can
+		 * zero them.
+		 */
+		if (desc->c_cpos >= wc->w_first_new_cpos) {
+			BUG_ON(phys == 0);
+			desc->c_needs_zero = 1;
+		}
+
 		desc->c_phys = phys;
 		if (phys == 0) {
 			desc->c_new = 1;
+			desc->c_needs_zero = 1;
 			*clusters_to_alloc = *clusters_to_alloc + 1;
 		}
-		if (ext_flags & OCFS2_EXT_UNWRITTEN)
+
+		if (ext_flags & OCFS2_EXT_UNWRITTEN) {
 			desc->c_unwritten = 1;
+			desc->c_needs_zero = 1;
+		}
 
 		num_clusters--;
 	}
@@ -1644,10 +1659,13 @@ static int ocfs2_expand_nonsparse_inode(
 	if (newsize <= i_size_read(inode))
 		return 0;
 
-	ret = ocfs2_extend_no_holes(inode, newsize, newsize - len);
+	ret = ocfs2_extend_no_holes(inode, newsize, pos);
 	if (ret)
 		mlog_errno(ret);
 
+	wc->w_first_new_cpos =
+		ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode));
+
 	return ret;
 }
 
@@ -1656,7 +1674,7 @@ int ocfs2_write_begin_nolock(struct addr
 			     struct page **pagep, void **fsdata,
 			     struct buffer_head *di_bh, struct page *mmap_page)
 {
-	int ret, credits = OCFS2_INODE_UPDATE_CREDITS;
+	int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS;
 	unsigned int clusters_to_alloc, extents_to_split;
 	struct ocfs2_write_ctxt *wc;
 	struct inode *inode = mapping->host;
@@ -1724,8 +1742,19 @@ int ocfs2_write_begin_nolock(struct addr
 
 	}
 
-	ocfs2_set_target_boundaries(osb, wc, pos, len,
-				    clusters_to_alloc + extents_to_split);
+	/*
+	 * We have to zero sparse allocated clusters, unwritten extent clusters,
+	 * and non-sparse clusters we just extended.  For non-sparse writes,
+	 * we know zeros will only be needed in the first and/or last cluster.
+	 */
+	if (clusters_to_alloc || extents_to_split ||
+	    wc->w_desc[0].c_needs_zero ||
+	    wc->w_desc[wc->w_clen - 1].c_needs_zero)
+		cluster_of_pages = 1;
+	else
+		cluster_of_pages = 0;
+
+	ocfs2_set_target_boundaries(osb, wc, pos, len, cluster_of_pages);
 
 	handle = ocfs2_start_trans(osb, credits);
 	if (IS_ERR(handle)) {
@@ -1753,8 +1782,7 @@ int ocfs2_write_begin_nolock(struct addr
 	 * extent.
 	 */
 	ret = ocfs2_grab_pages_for_write(mapping, wc, wc->w_cpos, pos,
-					 clusters_to_alloc + extents_to_split,
-					 mmap_page);
+					 cluster_of_pages, mmap_page);
 	if (ret) {
 		mlog_errno(ret);
 		goto out_commit;

Re: [patch 00/48] 2.6.27.32-stable review

[Greg KH]

On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> Greetings,
> 
> Patch 41/48 (ocfs2: Initialize the...) of this series causes a build 
> failure:
> 
> fs/ocfs2/aops.c: In function ‘ocfs2_write_cluster’:
> fs/ocfs2/aops.c:1286: error: ‘should_zero’ undeclared (first use in this 
> function)
> fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported 
> only once
> fs/ocfs2/aops.c:1286: error: for each function it appears in.)
> fs/ocfs2/aops.c: In function ‘ocfs2_write_cluster_by_desc’:
> fs/ocfs2/aops.c:1360: warning: passing argument 4 of 
> ‘ocfs2_write_cluster’ makes pointer from integer without a cast
> fs/ocfs2/aops.c:1360: warning: passing argument 6 of 
> ‘ocfs2_write_cluster’ from incompatible pointer type
> fs/ocfs2/aops.c:1360: warning: passing argument 7 of 
> ‘ocfs2_write_cluster’ makes integer from pointer without a cast
> fs/ocfs2/aops.c:1360: error: too many arguments to function 
> ‘ocfs2_write_cluster’
> 
> 
> A line from the upstream patch is missing in this patch:
> 
>   static int ocfs2_write_cluster(struct address_space *mapping,
>                      u32 phys, unsigned int unwritten,
> +                   unsigned int should_zero,
>                      struct ocfs2_alloc_context *data_ac,
>                      struct ocfs2_alloc_context *meta_ac,
>                      struct ocfs2_write_ctxt *wc, u32 cpos,
>                      loff_t user_pos, unsigned user_len)
> 
> 
> Attached is the corrected patch with the above line placed back in.

There was an add-on ocfs2 patch that should have now resolved this
issue.  If you still have this problem with the released kernel, please
let me know.

thanks,

greg k-h

Re: [patch 00/48] 2.6.27.32-stable review

[Michael Tokarev]

> On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> > Greetings,
> > 
> > Patch 41/48 (ocfs2: Initialize the...) of this series causes a build 
> > failure:
> > 
> > fs/ocfs2/aops.c: In function `ocfs2_write_cluster':
> > fs/ocfs2/aops.c:1286: error: `should_zero' undeclared (first use in this function)
> > fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported only once
> > fs/ocfs2/aops.c:1286: error: for each function it appears in.)
> > fs/ocfs2/aops.c: In function `ocfs2_write_cluster_by_desc':
... 
> > 
> > A line from the upstream patch is missing in this patch:
> > 
> >   static int ocfs2_write_cluster(struct address_space *mapping,
> >                      u32 phys, unsigned int unwritten,
> > +                   unsigned int should_zero,
> >                      struct ocfs2_alloc_context *data_ac,
> >                      struct ocfs2_alloc_context *meta_ac,
> >                      struct ocfs2_write_ctxt *wc, u32 cpos,
> >                      loff_t user_pos, unsigned user_len)
> > 
> > 
> > Attached is the corrected patch with the above line placed back in.
> 
> There was an add-on ocfs2 patch that should have now resolved this
> issue.  If you still have this problem with the released kernel, please
> let me know.

Well, with just-released 2.6.27.32 exactly the same issue occurs.
I used patch-2.6.27.32.bz2 on top of linux-2.6.26.tar.bz2, not
the tarball (linux-2.6.27.32.tar.bz2).

fs/ocfs2/aops.c: In function 'ocfs2_write_cluster':
fs/ocfs2/aops.c:1286: error: 'should_zero' undeclared (first use in this function)
fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported only once
fs/ocfs2/aops.c:1286: error: for each function it appears in.)
fs/ocfs2/aops.c: In function 'ocfs2_write_cluster_by_desc':
fs/ocfs2/aops.c:1360: warning: passing argument 4 of 'ocfs2_write_cluster' makes pointer from integer without a cast
fs/ocfs2/aops.c:1360: warning: passing argument 6 of 'ocfs2_write_cluster' from incompatible pointer type
fs/ocfs2/aops.c:1360: warning: passing argument 7 of 'ocfs2_write_cluster' makes integer from pointer without a cast
fs/ocfs2/aops.c:1360: error: too many arguments to function 'ocfs2_write_cluster'

Which add-on you're referring to?  In the stable-queue/releases/2.6.27.32/
I only see two patches related to ocfs:
 ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
 ocfs2-ocfs2_write_begin_nolock-should-handle-len-0.patch
Neither of which looks like an addon, and only one (the first)
has references to this "should_zero" variable.

Thanks!

/mjt

Re: [patch 00/48] 2.6.27.32-stable review

[Greg KH]

On Wed, Sep 09, 2009 at 11:31:50AM +0400, Michael Tokarev wrote:
> > On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> > > Greetings,
> > > 
> > > Patch 41/48 (ocfs2: Initialize the...) of this series causes a build 
> > > failure:
> > > 
> > > fs/ocfs2/aops.c: In function `ocfs2_write_cluster':
> > > fs/ocfs2/aops.c:1286: error: `should_zero' undeclared (first use in this function)
> > > fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported only once
> > > fs/ocfs2/aops.c:1286: error: for each function it appears in.)
> > > fs/ocfs2/aops.c: In function `ocfs2_write_cluster_by_desc':
> ... 
> > > 
> > > A line from the upstream patch is missing in this patch:
> > > 
> > >   static int ocfs2_write_cluster(struct address_space *mapping,
> > >                      u32 phys, unsigned int unwritten,
> > > +                   unsigned int should_zero,
> > >                      struct ocfs2_alloc_context *data_ac,
> > >                      struct ocfs2_alloc_context *meta_ac,
> > >                      struct ocfs2_write_ctxt *wc, u32 cpos,
> > >                      loff_t user_pos, unsigned user_len)
> > > 
> > > 
> > > Attached is the corrected patch with the above line placed back in.
> > 
> > There was an add-on ocfs2 patch that should have now resolved this
> > issue.  If you still have this problem with the released kernel, please
> > let me know.
> 
> Well, with just-released 2.6.27.32 exactly the same issue occurs.
> I used patch-2.6.27.32.bz2 on top of linux-2.6.26.tar.bz2, not
> the tarball (linux-2.6.27.32.tar.bz2).
> 
> fs/ocfs2/aops.c: In function 'ocfs2_write_cluster':
> fs/ocfs2/aops.c:1286: error: 'should_zero' undeclared (first use in this function)
> fs/ocfs2/aops.c:1286: error: (Each undeclared identifier is reported only once
> fs/ocfs2/aops.c:1286: error: for each function it appears in.)
> fs/ocfs2/aops.c: In function 'ocfs2_write_cluster_by_desc':
> fs/ocfs2/aops.c:1360: warning: passing argument 4 of 'ocfs2_write_cluster' makes pointer from integer without a cast
> fs/ocfs2/aops.c:1360: warning: passing argument 6 of 'ocfs2_write_cluster' from incompatible pointer type
> fs/ocfs2/aops.c:1360: warning: passing argument 7 of 'ocfs2_write_cluster' makes integer from pointer without a cast
> fs/ocfs2/aops.c:1360: error: too many arguments to function 'ocfs2_write_cluster'
> 
> Which add-on you're referring to?  In the stable-queue/releases/2.6.27.32/
> I only see two patches related to ocfs:
>  ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
>  ocfs2-ocfs2_write_begin_nolock-should-handle-len-0.patch
> Neither of which looks like an addon, and only one (the first)
> has references to this "should_zero" variable.

I thought the second one would solve the problem.

What happened here, I took the upstream patch, was it incorrect?  If so,
was there a patch, also upstream, that fixed this problem?

totally confused,

greg k-h

Re: [patch 00/48] 2.6.27.32-stable review

[Jayson King]

Greg KH wrote:
 >I thought the second one would solve the problem.
 >
 >What happened here, I took the upstream patch, was it incorrect? If so,
 >was there a patch, also upstream, that fixed this problem?
 >
 >totally confused,

No. The upstream patch was not incorrect, but it was incompletely 
applied to 2.6.27. The missing line is not missing in the upstream 
patch. The replacement for the patch I sent earlier puts the line back in.

Jayson R. King

(sorry if I am dropping anyone from CC. I am not subscribed to LKML)

Re: [patch 00/48] 2.6.27.32-stable review

[Joel Becker]

On Wed, Sep 09, 2009 at 06:23:40AM -0700, Greg KH wrote:
> On Wed, Sep 09, 2009 at 11:31:50AM +0400, Michael Tokarev wrote:
> > > On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> > > > A line from the upstream patch is missing in this patch:
> > > > 
> > > >   static int ocfs2_write_cluster(struct address_space *mapping,
> > > >                      u32 phys, unsigned int unwritten,
> > > > +                   unsigned int should_zero,
> > > >                      struct ocfs2_alloc_context *data_ac,
> > > >                      struct ocfs2_alloc_context *meta_ac,
> > > >                      struct ocfs2_write_ctxt *wc, u32 cpos,
> > > >                      loff_t user_pos, unsigned user_len)

<snip>

> >  ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
> >  ocfs2-ocfs2_write_begin_nolock-should-handle-len-0.patch
> > Neither of which looks like an addon, and only one (the first)
> > has references to this "should_zero" variable.
> 
> I thought the second one would solve the problem.
> 
> What happened here, I took the upstream patch, was it incorrect?  If so,
> was there a patch, also upstream, that fixed this problem?

	The upstream first patch is
e7432675f8ca868a4af365759a8d4c3779a3d922.  It has this line.  The second
patch fixes a bug in the first patch, but the bug is not around this
line, it's totally separate.
	Ok, I'm confused.  In linux-2.6-stable.git, the 2.6.30.y branch
has this for the diff:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=122fb7978f60f7dde54ac0567f578159900f163b;hp=b2c52b3a1484f1c57c4b098bf9706fe21c186ac0;hb=9baf278cca4043a1312f3a40bf17b979b6238ebc;hpb=8c668814e3e2be7d633447bf6e78237d4cedabb7
It has the correct line.
	But in 2.6.27.y branch, referencing the same upstream commit,
there is this diff:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=50bb561860dfb5ee024e7a992bb4d72bc71f0372;hp=a53da1466277abd843b0117f89df9850423ba92b;hb=8338941200d9188e3c866dd16cc2848754947895;hpb=7e8287379470a7c18153be389c9516e31ae141f3
It is missing the line.  I think the cherry-pick for 2.6.27.y got
broken.

Joel

-- 

"If you are ever in doubt as to whether or not to kiss a pretty girl, 
 give her the benefit of the doubt"
                                        -Thomas Carlyle

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127

Re: [patch 00/48] 2.6.27.32-stable review

[Greg KH]

On Wed, Sep 09, 2009 at 11:28:02AM -0700, Joel Becker wrote:
> On Wed, Sep 09, 2009 at 06:23:40AM -0700, Greg KH wrote:
> > On Wed, Sep 09, 2009 at 11:31:50AM +0400, Michael Tokarev wrote:
> > > > On Tue, Sep 08, 2009 at 09:47:51AM -0500, Jayson King wrote:
> > > > > A line from the upstream patch is missing in this patch:
> > > > > 
> > > > >   static int ocfs2_write_cluster(struct address_space *mapping,
> > > > >                      u32 phys, unsigned int unwritten,
> > > > > +                   unsigned int should_zero,
> > > > >                      struct ocfs2_alloc_context *data_ac,
> > > > >                      struct ocfs2_alloc_context *meta_ac,
> > > > >                      struct ocfs2_write_ctxt *wc, u32 cpos,
> > > > >                      loff_t user_pos, unsigned user_len)
> 
> <snip>
> 
> > >  ocfs2-initialize-the-cluster-we-re-writing-to-in-a-non-sparse-extend.patch
> > >  ocfs2-ocfs2_write_begin_nolock-should-handle-len-0.patch
> > > Neither of which looks like an addon, and only one (the first)
> > > has references to this "should_zero" variable.
> > 
> > I thought the second one would solve the problem.
> > 
> > What happened here, I took the upstream patch, was it incorrect?  If so,
> > was there a patch, also upstream, that fixed this problem?
> 
> 	The upstream first patch is
> e7432675f8ca868a4af365759a8d4c3779a3d922.  It has this line.  The second
> patch fixes a bug in the first patch, but the bug is not around this
> line, it's totally separate.
> 	Ok, I'm confused.  In linux-2.6-stable.git, the 2.6.30.y branch
> has this for the diff:
> http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=122fb7978f60f7dde54ac0567f578159900f163b;hp=b2c52b3a1484f1c57c4b098bf9706fe21c186ac0;hb=9baf278cca4043a1312f3a40bf17b979b6238ebc;hpb=8c668814e3e2be7d633447bf6e78237d4cedabb7
> It has the correct line.
> 	But in 2.6.27.y branch, referencing the same upstream commit,
> there is this diff:
> http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6-stable.git;a=blobdiff;f=fs/ocfs2/aops.c;h=50bb561860dfb5ee024e7a992bb4d72bc71f0372;hp=a53da1466277abd843b0117f89df9850423ba92b;hb=8338941200d9188e3c866dd16cc2848754947895;hpb=7e8287379470a7c18153be389c9516e31ae141f3
> It is missing the line.  I think the cherry-pick for 2.6.27.y got
> broken.

Very wierd.  I used the same patch to pick from :(

I'll go fix this up and do a new release for the .27 tree.  Thanks for
working it out for me.

greg k-h

Re: [patch 00/48] 2.6.27.32-stable review

[Chuck Ebbert]

On Wed, 9 Sep 2009 11:36:40 -0700
Greg KH <gregkh@suse.de> wrote:

> 
> Very wierd.  I used the same patch to pick from :(
> 
> I'll go fix this up and do a new release for the .27 tree.  Thanks for
> working it out for me.
> 

I diagnosed this and sent the fix to you on Saturday:

http://patchwork.kernel.org/patch/45946

Re: [patch 00/48] 2.6.27.32-stable review

[Greg KH]

On Wed, Sep 09, 2009 at 03:20:03PM -0400, Chuck Ebbert wrote:
> On Wed, 9 Sep 2009 11:36:40 -0700
> Greg KH <gregkh@suse.de> wrote:
> 
> > 
> > Very wierd.  I used the same patch to pick from :(
> > 
> > I'll go fix this up and do a new release for the .27 tree.  Thanks for
> > working it out for me.
> > 
> 
> I diagnosed this and sent the fix to you on Saturday:
> 
> http://patchwork.kernel.org/patch/45946

Doh, you did, my apologies...

Re: [patch 00/48] 2.6.27.32-stable review

[Greg KH]

On Mon, Sep 07, 2009 at 12:58:26AM +0200, Tilman Schmidt wrote:
> Greg,
> 
> if at all possible, could you please include the patch below, with an
> 
> Acked-by: Tilman Schmidt <tilman@imap.cc>
> 
> tacked on? It applies fine to 2.6.27.31.

Ok, I'm confused.

What specific patch do you need applied?  What is the git commit id of
the patch in Linus's tree?  I tried the git ids below, and 2 of them
don't match up.

odd,

greg k-h


> ---- original message follows ----
> Message-ID: <4A9524BE.3060508@canonical.com>
> Date: Wed, 26 Aug 2009 14:04:14 +0200
> From: Stefan Bader <stefan.bader@canonical.com>
> To: stable@kernel.org
> CC: Tilman Schmidt <tilman@imap.cc>, 
>  "David S. Miller" <davem@davemloft.net>,
>  Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> Subject: [PATCH] Fix incorrect stable backport to bas_gigaset patch
> 
> This seems to affect 2.6.27.y and (discontinued) 2.6.28.y. Some code went into 
> gigaset_probe instead of gigaset_initcshw causing an oops when the hardware is 
> probed.
> [I added one pr_err statement from upstream, too)
> 
> -Stefan
> 
> From 944fd2dab4173cea4fdcd50732529639ec00cf5d Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Tue, 25 Aug 2009 17:35:56 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Fix incorrect stable backport to bas_gigaset
> 
> BugLink: http://bugs.launchpad.net/bugs/417732
> 
> commit 56f7efe48d57dda9e59e23ab161c118271cce815
> Author: Tilman Schmidt <tilman@imap.cc>
> Date:   Wed Apr 15 03:25:43 2009 -0700
> 
>     bas_gigaset: correctly allocate USB interrupt transfer buffer
> 
>     [ Upstream commit 170ebf85160dd128e1c4206cc197cce7d1424705 ]
> 
> This incorrect backport to 2.6.28.10 placed some code into the probe function
> which used a pointer before it was initialized. Moving this to the correct
> place (as it is in upstream).
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  drivers/isdn/gigaset/bas-gigaset.c |   16 +++++++++-------
>  1 files changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
> index fcec2df..3990eae 100644
> --- a/drivers/isdn/gigaset/bas-gigaset.c
> +++ b/drivers/isdn/gigaset/bas-gigaset.c
> @@ -2140,8 +2140,16 @@ static int gigaset_initcshw(struct cardstate *cs)
>  	struct bas_cardstate *ucs;
>  
>  	cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
> -	if (!ucs)
> +	if (!ucs) {
> +		pr_err("out of memory\n");
> +		return 0;
> +	}
> +	ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
> +	if (!ucs->int_in_buf) {
> +		kfree(ucs);
> +		pr_err("out of memory\n");
>  		return 0;
> +	}
>  
>  	ucs->urb_cmd_in = NULL;
>  	ucs->urb_cmd_out = NULL;
> @@ -2236,12 +2244,6 @@ static int gigaset_probe(struct usb_interface *interface,
>  		}
>  		hostif = interface->cur_altsetting;
>  	}
> -	ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
> -	if (!ucs->int_in_buf) {
> -		kfree(ucs);
> -		pr_err("out of memory\n");
> -		return 0;
> -	}
>  
>  	/* Reject application specific interfaces
>  	 */
> -- 
> 1.5.4.3
> 
> -- 
> Tilman Schmidt                    E-Mail: tilman@imap.cc
> Bonn, Germany
> Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
> Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
>