Subject: Re: linux-next: build warning after merge of the vfs tree

From: Al Viro <[email-masked]>
Date: Thu, 5 Jan 2012 08:19:21 +0000

On Thu, Jan 05, 2012 at 07:14:34PM +1100, Stephen Rothwell wrote:
> > by the second (i.e. replace mnt->mnt_sb with dentry->d_sb).  Incidentally,
> 
> OK, I may apply that fix tomorrow.

FWIW, incremental is simply

--- a/fs/reiserfs/super.c	2012-01-05 03:18:03.000000000 -0500
+++ b/fs/reiserfs/super.c	2012-01-05 03:09:45.000000000 -0500
@@ -598,9 +598,9 @@
 	reiserfs_write_unlock_once(inode->i_sb, lock_depth);
 }
 
-static int reiserfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
+static int reiserfs_show_options(struct seq_file *seq, struct dentry *root)
 {
-	struct super_block *s = vfs->mnt_sb;
+	struct super_block *s = root->d_sb;
 	struct reiserfs_journal *journal = SB_JOURNAL(s);
 	long opts = REISERFS_SB(s)->s_mount_opt;