more patches added to queue

diff --git a/queue-2.6.16/alpha-strncpy-fix.patch b/queue-2.6.16/alpha-strncpy-fix.patch
new file mode 100644 (file)
index 0000000..754882e
--- /dev/null
+++ b/queue-2.6.16/alpha-strncpy-fix.patch
@@ -0,0 +1,49 @@
+From git-commits-head-owner@vger.kernel.org Tue Apr 25 07:59:43 2006
+Date: Tue, 25 Apr 2006 14:59:34 GMT
+Message-Id: <200604251459.k3PExYuf032535@hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Subject: Alpha: strncpy() fix
+
+From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
+
+[PATCH] Alpha: strncpy() fix
+
+As it turned out after recent SCSI changes, strncpy() was broken -
+it mixed up the return values from __stxncpy() in registers $24 and $27.
+
+Thanks to Mathieu Chouquet-Stringer for tracking down the problem
+and providing an excellent test case.
+
+Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/alpha/lib/strncpy.S |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- linux-2.6.16.11.orig/arch/alpha/lib/strncpy.S
++++ linux-2.6.16.11/arch/alpha/lib/strncpy.S
+@@ -43,8 +43,8 @@ strncpy:
+ 
+       .align  4
+ $multiword:
+-      subq    $24, 1, $2      # clear the final bits in the prev word
+-      or      $2, $24, $2
++      subq    $27, 1, $2      # clear the final bits in the prev word
++      or      $2, $27, $2
+       zapnot  $1, $2, $1
+       subq    $18, 1, $18
+ 
+@@ -70,8 +70,8 @@ $multiword:
+       bne     $18, 0b
+ 
+ 1:    ldq_u   $1, 0($16)      # clear the leading bits in the final word
+-      subq    $27, 1, $2
+-      or      $2, $27, $2
++      subq    $24, 1, $2
++      or      $2, $24, $2
+ 
+       zap     $1, $2, $1
+       stq_u   $1, 0($16)

diff --git a/queue-2.6.16/altix-snsc-duplicate-kobject-fix.patch b/queue-2.6.16/altix-snsc-duplicate-kobject-fix.patch
new file mode 100644 (file)
index 0000000..d6116ab
--- /dev/null
+++ b/queue-2.6.16/altix-snsc-duplicate-kobject-fix.patch
@@ -0,0 +1,36 @@
+From git-commits-head-owner@vger.kernel.org Sun Apr 23 10:10:51 2006
+Date: Sun, 23 Apr 2006 17:10:42 GMT
+Message-Id: <200604231710.k3NHAgJi012704@hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Subject: Altix snsc: duplicate kobject fix
+
+From: Greg Howard <ghoward@sgi.com>
+
+Fix Altix system controller (snsc) device names to include the slot number
+of the blade whose associated system controller is the target of the device
+interface.  Including the slot number avoids a problem we're currently
+having where slots within the same enclosure are attempting to create
+multiple kobjects with identical names.
+
+Signed-off-by: Greg Howard <ghoward@sgi.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/snsc.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- linux-2.6.16.11.orig/drivers/char/snsc.c
++++ linux-2.6.16.11/drivers/char/snsc.c
+@@ -391,7 +391,8 @@ scdrv_init(void)
+                       format_module_id(devnamep, geo_module(geoid),
+                                        MODULE_FORMAT_BRIEF);
+                       devnamep = devname + strlen(devname);
+-                      sprintf(devnamep, "#%d", geo_slab(geoid));
++                      sprintf(devnamep, "^%d#%d", geo_slot(geoid),
++                              geo_slab(geoid));
+ 
+                       /* allocate sysctl device data */
+                       scd = kmalloc(sizeof (struct sysctl_data_s),

diff --git a/queue-2.6.16/fix-reiserfs-deadlock.patch b/queue-2.6.16/fix-reiserfs-deadlock.patch
new file mode 100644 (file)
index 0000000..f618d22
--- /dev/null
+++ b/queue-2.6.16/fix-reiserfs-deadlock.patch
@@ -0,0 +1,42 @@
+From git-commits-head-owner@vger.kernel.org Sun Apr 23 10:10:51 2006
+Date: Sun, 23 Apr 2006 17:10:44 GMT
+Message-Id: <200604231710.k3NHAiFN012728@hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
+To: git-commits-head@vger.kernel.org
+Subject: [PATCH] Fix reiserfs deadlock
+
+From: Jan Kara <jack@suse.cz>
+
+[PATCH] Fix reiserfs deadlock
+
+reiserfs_cache_default_acl() should return whether we successfully found
+the acl or not.  We have to return correct value even if reiserfs_get_acl()
+returns error code and not just 0.  Otherwise callers such as
+reiserfs_mkdir() can unnecessarily lock the xattrs and later functions such
+as reiserfs_new_inode() fail to notice that we have already taken the lock
+and try to take it again with obvious consequences.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+Cc: <reiserfs-dev@namesys.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/reiserfs/xattr_acl.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- linux-2.6.16.11.orig/fs/reiserfs/xattr_acl.c
++++ linux-2.6.16.11/fs/reiserfs/xattr_acl.c
+@@ -408,8 +408,9 @@ int reiserfs_cache_default_acl(struct in
+               acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT);
+               reiserfs_read_unlock_xattrs(inode->i_sb);
+               reiserfs_read_unlock_xattr_i(inode);
+-              ret = acl ? 1 : 0;
+-              posix_acl_release(acl);
++              ret = (acl && !IS_ERR(acl));
++              if (ret)
++                      posix_acl_release(acl);
+       }
+ 
+       return ret;

diff --git a/queue-2.6.16/series b/queue-2.6.16/series
index b72167a5473ff165e7c028e56308f648e7834b1c..bf26420d3d3539088d685f2ed71cf376aa322820 100644 (file)
--- a/queue-2.6.16/series
+++ b/queue-2.6.16/series
@@ -12,3 +12,6 @@ cxusb-bluebird-bug-fix-power-down-corrupts-frontend.patch
 dm-snapshot-fix-kcopyd-destructor.patch
 dm-flush-queue-EINTR.patch
 simplify-proc-devices-and-fix-early-termination-regression.patch
+fix-reiserfs-deadlock.patch
+altix-snsc-duplicate-kobject-fix.patch
+alpha-strncpy-fix.patch