[kernel] r19318 - dists/sid/linux/debian/patches/features/all

[Ben Hutchings]

Author: benh
Date: Sun Aug 12 16:51:56 2012
New Revision: 19318

Log:
Fix parameters to debugfs_show_options(), as commented in the header

No idea how this change got lost; I certainly got as far as building
and installing a package with the fixed version of this patch.

Modified:
   dists/sid/linux/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch

Modified: dists/sid/linux/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch	Sat Aug 11 20:32:07 2012	(r19317)
+++ dists/sid/linux/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch	Sun Aug 12 16:51:56 2012	(r19318)
@@ -20,11 +20,9 @@
  fs/debugfs/inode.c                    |  149 ++++++++++++++++++++++++++++++++-
  2 files changed, 152 insertions(+), 2 deletions(-)
 
-diff --git a/Documentation/filesystems/debugfs.txt b/Documentation/filesystems/debugfs.txt
-index 6872c91..4e25758 100644
 --- a/Documentation/filesystems/debugfs.txt
 +++ b/Documentation/filesystems/debugfs.txt
-@@ -14,7 +14,10 @@ Debugfs is typically mounted with a command like:
+@@ -14,7 +14,10 @@ Debugfs is typically mounted with a comm
  
      mount -t debugfs none /sys/kernel/debug
  
@@ -36,8 +34,6 @@
  
  Note that the debugfs API is exported GPL-only to modules.
  
-diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
-index 956d5dd..b80bc84 100644
 --- a/fs/debugfs/inode.c
 +++ b/fs/debugfs/inode.c
 @@ -23,9 +23,13 @@
@@ -54,7 +50,7 @@
  static struct vfsmount *debugfs_mount;
  static int debugfs_mount_count;
  static bool debugfs_registered;
-@@ -125,11 +129,154 @@ static inline int debugfs_positive(struct dentry *dentry)
+@@ -125,11 +129,154 @@ static inline int debugfs_positive(struc
  	return dentry->d_inode && !d_unhashed(dentry);
  }
  
@@ -152,9 +148,9 @@
 +	return err;
 +}
 +
-+static int debugfs_show_options(struct seq_file *m, struct dentry *root)
++static int debugfs_show_options(struct seq_file *m, struct vfsmount *mnt)
 +{
-+	struct debugfs_fs_info *fsi = root->d_sb->s_fs_info;
++	struct debugfs_fs_info *fsi = mnt->mnt_sb->s_fs_info;
 +	struct debugfs_mount_opts *opts = &fsi->mount_opts;
 +
 +	if (opts->uid != 0)