[kernel/f16] Fix broken procfs backport (rhbz 782961)

[Josh Boyer]

commit 70bec5f650c3b9f38be13d21530aa4fe893bb352
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Jan 18 20:00:25 2012 -0500

    Fix broken procfs backport (rhbz 782961)

 kernel.spec                                    |    5 ++++-
 procfs-add-hidepid-and-gid-mount-options.patch |    4 ++--
 procfs-parse-mount-options.patch               |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index bda9dbf..3dd83a4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2398,6 +2398,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 18 2012 Josh Boyer <jwboyer at redhat.com> 3.1.10-2
+- Fix broken procfs backport (rhbz 782961)
+
 * Wed Jan 18 2012 Josh Boyer <jwboyer at redhat.com> 3.1.10-1
 - Linux 3.1.10
 - /proc/pid/* information leak (rhbz 782686)
diff --git a/procfs-add-hidepid-and-gid-mount-options.patch b/procfs-add-hidepid-and-gid-mount-options.patch
index 24156b0..803f77d 100644
--- a/procfs-add-hidepid-and-gid-mount-options.patch
+++ b/procfs-add-hidepid-and-gid-mount-options.patch
@@ -262,9 +262,9 @@ index 27c762f..84fd323 100644
 +++ b/fs/proc/inode.c
 @@ -106,6 +106,14 @@ void __init proc_init_inodecache(void)
  
- static int proc_show_options(struct seq_file *seq, struct dentry *root)
+ static int proc_show_options(struct seq_file *seq, struct vfsmount *vfs)
  {
-+	struct super_block *sb = root->d_sb;
++	struct super_block *sb = vfs->mnt_sb;
 +	struct pid_namespace *pid = sb->s_fs_info;
 +
 +	if (pid->pid_gid)
diff --git a/procfs-parse-mount-options.patch b/procfs-parse-mount-options.patch
index 99684c4..0187a1d 100644
--- a/procfs-parse-mount-options.patch
+++ b/procfs-parse-mount-options.patch
@@ -50,7 +50,7 @@ index 51a1766..27c762f 100644
  					     init_once);
  }
  
-+static int proc_show_options(struct seq_file *seq, struct dentry *root)
++static int proc_show_options(struct seq_file *seq, struct vfsmount *vfs)
 +{
 +	return 0;
 +}