Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c80b1d authored by Al Viro's avatar Al Viro
Browse files

vfs: switch ->show_options() to struct dentry * 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a6322de6

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ prototypes: 
	int (*statfs) (struct dentry *, struct kstatfs *);

	int (*remount_fs) (struct super_block *, int *, char *);

	void (*umount_begin) (struct super_block *);

	int (*show_options)(struct seq_file *, struct vfsmount *);

	int (*show_options)(struct seq_file *, struct dentry *);

	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);

	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);

	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ struct super_operations { 
        void (*clear_inode) (struct inode *);

        void (*umount_begin) (struct super_block *);



        int (*show_options)(struct seq_file *, struct vfsmount *);

        int (*show_options)(struct seq_file *, struct dentry *);



        ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);

        ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);

arch/s390/hypfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -259,9 +259,9 @@ static int hypfs_parse_options(char *options, struct super_block *sb) 
	return 0;

}



static int hypfs_show_options(struct seq_file *s, struct vfsmount *mnt)

static int hypfs_show_options(struct seq_file *s, struct dentry *root)

{

	struct hypfs_sb_info *hypfs_info = mnt->mnt_sb->s_fs_info;

	struct hypfs_sb_info *hypfs_info = root->d_sb->s_fs_info;



	seq_printf(s, ",uid=%u", hypfs_info->uid);

	seq_printf(s, ",gid=%u", hypfs_info->gid);

drivers/staging/pohmelfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1369,9 +1369,9 @@ static int pohmelfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	return 0;

}



static int pohmelfs_show_options(struct seq_file *seq, struct vfsmount *vfs)

static int pohmelfs_show_options(struct seq_file *seq, struct dentry *root)

{

	struct pohmelfs_sb *psb = POHMELFS_SB(vfs->mnt_sb);

	struct pohmelfs_sb *psb = POHMELFS_SB(root->d_sb);



	seq_printf(seq, ",idx=%u", psb->idx);

	seq_printf(seq, ",trans_scan_timeout=%u", jiffies_to_msecs(psb->trans_scan_timeout));

drivers/usb/core/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static umode_t devmode = USBFS_DEFAULT_DEVMODE; 
static umode_t busmode = USBFS_DEFAULT_BUSMODE;

static umode_t listmode = USBFS_DEFAULT_LISTMODE;



static int usbfs_show_options(struct seq_file *seq, struct vfsmount *mnt)

static int usbfs_show_options(struct seq_file *seq, struct dentry *root)

{

	if (devuid != 0)

		seq_printf(seq, ",devuid=%u", devuid);