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

Commit d8c9584e authored by Al Viro's avatar Al Viro
Browse files

vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb 



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

fs/autofs4/dev-ioctl.c

+5 −5
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int find_autofs_mount(const char *pathname, 
		return err;

	err = -ENOENT;

	while (path.dentry == path.mnt->mnt_root) {

		if (path.mnt->mnt_sb->s_magic == AUTOFS_SUPER_MAGIC) {

		if (path.dentry->d_sb->s_magic == AUTOFS_SUPER_MAGIC) {

			if (test(&path, data)) {

				path_get(&path);

				if (!err) /* already found some */
@@ -212,7 +212,7 @@ static int find_autofs_mount(const char *pathname, 


static int test_by_dev(struct path *path, void *p)

{

	return path->mnt->mnt_sb->s_dev == *(dev_t *)p;

	return path->dentry->d_sb->s_dev == *(dev_t *)p;

}



static int test_by_type(struct path *path, void *p)
@@ -538,11 +538,11 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, 
			err = find_autofs_mount(name, &path, test_by_type, &type);

		if (err)

			goto out;

		devid = new_encode_dev(path.mnt->mnt_sb->s_dev);

		devid = new_encode_dev(path.dentry->d_sb->s_dev);

		err = 0;

		if (path.mnt->mnt_root == path.dentry) {

			err = 1;

			magic = path.mnt->mnt_sb->s_magic;

			magic = path.dentry->d_sb->s_magic;

		}

	} else {

		dev_t dev = sbi->sb->s_dev;
@@ -556,7 +556,7 @@ static int autofs_dev_ioctl_ismountpoint(struct file *fp, 
		err = have_submounts(path.dentry);



		if (follow_down_one(&path))

			magic = path.mnt->mnt_sb->s_magic;

			magic = path.dentry->d_sb->s_magic;

	}



	param->ismountpoint.out.devid = devid;

fs/binfmt_misc.c

+3 −3
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer, 
			break;

		case 2: set_bit(Enabled, &e->flags);

			break;

		case 3: root = dget(file->f_path.mnt->mnt_sb->s_root);

		case 3: root = dget(file->f_path.dentry->d_sb->s_root);

			mutex_lock(&root->d_inode->i_mutex);



			kill_node(e);
@@ -587,7 +587,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer, 
	Node *e;

	struct inode *inode;

	struct dentry *root, *dentry;

	struct super_block *sb = file->f_path.mnt->mnt_sb;

	struct super_block *sb = file->f_path.dentry->d_sb;

	int err = 0;



	e = create_entry(buffer, count);
@@ -666,7 +666,7 @@ static ssize_t bm_status_write(struct file * file, const char __user * buffer, 
	switch (res) {

		case 1: enabled = 0; break;

		case 2: enabled = 1; break;

		case 3: root = dget(file->f_path.mnt->mnt_sb->s_root);

		case 3: root = dget(file->f_path.dentry->d_sb->s_root);

			mutex_lock(&root->d_inode->i_mutex);



			while (!list_empty(&entries))

fs/ext3/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2909,7 +2909,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id, 
		return -EINVAL;



	/* Quotafile not on the same filesystem? */

	if (path->mnt->mnt_sb != sb)

	if (path->dentry->d_sb != sb)

		return -EXDEV;

	/* Journaling quota? */

	if (EXT3_SB(sb)->s_qf_names[type]) {

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -4781,7 +4781,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, 
		return -EINVAL;



	/* Quotafile not on the same filesystem? */

	if (path->mnt->mnt_sb != sb)

	if (path->dentry->d_sb != sb)

		return -EXDEV;

	/* Journaling quota? */

	if (EXT4_SB(sb)->s_qf_names[type]) {

fs/fhandle.c

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ static long do_sys_name_to_handle(struct path *path, 
	 * We need t make sure wether the file system

	 * support decoding of the file handle

	 */

	if (!path->mnt->mnt_sb->s_export_op ||

	    !path->mnt->mnt_sb->s_export_op->fh_to_dentry)

	if (!path->dentry->d_sb->s_export_op ||

	    !path->dentry->d_sb->s_export_op->fh_to_dentry)

		return -EOPNOTSUPP;



	if (copy_from_user(&f_handle, ufh, sizeof(struct file_handle)))