another .32 patch

diff --git a/review-2.6.32/series b/review-2.6.32/series
index ef39121cd9a202fd98696b688d8ce9ebe22c4a93..94bc219db89ff6f70d02ab57008b14eb184d34ba 100644 (file)
--- a/review-2.6.32/series
+++ b/review-2.6.32/series
@@ -11,6 +11,7 @@ davinci-dm646x-add-support-for-3.x-silicon-revision.patch
 input-alps-add-interleaved-protocol-support-dell-e6x00-series.patch
 driver-core-devtmpfs-set-root-directory-mode-to-0755.patch
 driver-core-fix-devtmpfs-crash-on-s390.patch
+vfs-get_sb_single-do-not-pass-options-twice.patch
 alsa-hda-add-pci-ids-for-nvidia-g2xx-series.patch
 v4l-dvb-13569-smsusb-add-autodetection-support-for-five-additional-hauppauge-usb-ids.patch
 usb-mos7840-add-device-ids-for-b-b-electronics-devices.patch

diff --git a/review-2.6.32/vfs-get_sb_single-do-not-pass-options-twice.patch b/review-2.6.32/vfs-get_sb_single-do-not-pass-options-twice.patch
new file mode 100644 (file)
index 0000000..f06da7a
--- /dev/null
+++ b/review-2.6.32/vfs-get_sb_single-do-not-pass-options-twice.patch
@@ -0,0 +1,38 @@
+From 9329d1beaeed1a94f030c784dcec5ff973f402c4 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Fri, 18 Dec 2009 21:18:15 +0100
+Subject: vfs: get_sb_single() - do not pass options twice
+
+From: Kay Sievers <kay.sievers@vrfy.org>
+
+commit 9329d1beaeed1a94f030c784dcec5ff973f402c4 upstream.
+
+Filesystem code usually destroys the option buffer while
+parsing it. This leads to errors when the same buffer is
+passed twice. In case we fill a new superblock do not call
+remount.
+
+This is needed to quite a warning that the debugfs code
+causes every boot.
+
+Cc: Miklos Szeredi <miklos@szeredi.hu>
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/super.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/super.c
++++ b/fs/super.c
+@@ -901,8 +901,9 @@ int get_sb_single(struct file_system_typ
+                       return error;
+               }
+               s->s_flags |= MS_ACTIVE;
++      } else {
++              do_remount_sb(s, flags, data, 0);
+       }
+-      do_remount_sb(s, flags, data, 0);
+       simple_set_mnt(mnt, s);
+       return 0;
+ }