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

Commit 06ee6e21 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman
Browse files

block/loop: Don't grab "struct file" for vfs_getattr() operation. 



commit b1ab5fa309e6c49e4e06270ec67dd7b3e9971d04 upstream.

vfs_getattr() needs "struct path" rather than "struct file".
Let's use path_get()/path_put() rather than get_file()/fput().

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f3dd37e

drivers/block/loop.c

+5 −5
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) 
static int

loop_get_status(struct loop_device *lo, struct loop_info64 *info)

{

	struct file *file;

	struct path path;

	struct kstat stat;

	int ret;
@@ -1200,16 +1200,16 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info) 
	}



	/* Drop lo_ctl_mutex while we call into the filesystem. */

	file = get_file(lo->lo_backing_file);

	path = lo->lo_backing_file->f_path;

	path_get(&path);

	mutex_unlock(&lo->lo_ctl_mutex);

	ret = vfs_getattr(&file->f_path, &stat, STATX_INO,

			  AT_STATX_SYNC_AS_STAT);

	ret = vfs_getattr(&path, &stat, STATX_INO, AT_STATX_SYNC_AS_STAT);

	if (!ret) {

		info->lo_device = huge_encode_dev(stat.dev);

		info->lo_inode = stat.ino;

		info->lo_rdevice = huge_encode_dev(stat.rdev);

	}

	fput(file);

	path_put(&path);

	return ret;

}