diff --git a/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch b/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch index 61a5c4313..8f44f5cf8 100644 --- a/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch +++ b/debian/patches/features/all/debugfs-add-mode-uid-and-gid-options.patch @@ -20,11 +20,9 @@ Signed-off-by: Greg Kroah-Hartman 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 @@ index 6872c91..4e25758 100644 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 @@ index 956d5dd..b80bc84 100644 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 @@ index 956d5dd..b80bc84 100644 + 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)