| Message ID | 1537889209-7208-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] block/loop: Don't grab "struct file" for vfs_getattr() operation. | expand |
On Wed, Sep 26, 2018 at 12:26:46AM +0900, Tetsuo Handa wrote: > vfs_getattr() needs "struct path" rather than "struct file". > Let's use path_get()/path_put() rather than get_file()/fput(). Reviewed-by: Omar Sandoval <osandov@fb.com> > Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Reviewed-by: Jan Kara <jack@suse.cz> > --- > drivers/block/loop.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/block/loop.c b/drivers/block/loop.c > index abad6d1..c2745e6 100644 > --- a/drivers/block/loop.c > +++ b/drivers/block/loop.c > @@ -1206,7 +1206,7 @@ static int loop_clr_fd(struct loop_device *lo) > static int > loop_get_status(struct loop_device *lo, struct loop_info64 *info) > { > - struct file *file; > + struct path path; > struct kstat stat; > int ret; > > @@ -1231,16 +1231,16 @@ static int loop_clr_fd(struct loop_device *lo) > } > > /* 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; > } > > -- > 1.8.3.1 >
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index abad6d1..c2745e6 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1206,7 +1206,7 @@ static int loop_clr_fd(struct loop_device *lo) static int loop_get_status(struct loop_device *lo, struct loop_info64 *info) { - struct file *file; + struct path path; struct kstat stat; int ret; @@ -1231,16 +1231,16 @@ static int loop_clr_fd(struct loop_device *lo) } /* 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; }