diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2022-12-02 18:00:15 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2022-12-06 16:06:31 +0100 |
| commit | 4ad02083a092b497f35804de03eaa62cf81fada6 (patch) | |
| tree | 3bbd9abb90556a65a8b23cdca1d1946af202a4f9 /fs/gfs2/file.c | |
| parent | 70376c7ff31221f1d21db5611d8209e677781d3a (diff) | |
| download | lwn-4ad02083a092b497f35804de03eaa62cf81fada6.tar.gz lwn-4ad02083a092b497f35804de03eaa62cf81fada6.zip | |
gfs2: Make gfs2_glock_hold return its glock argument
This allows code like 'gl = gfs2_glock_hold(...)'.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'fs/gfs2/file.c')
| -rw-r--r-- | fs/gfs2/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 60c6fb91fb58..eea5be4fbf0e 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -1445,14 +1445,13 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) static void __flock_holder_uninit(struct file *file, struct gfs2_holder *fl_gh) { - struct gfs2_glock *gl = fl_gh->gh_gl; + struct gfs2_glock *gl = gfs2_glock_hold(fl_gh->gh_gl); /* * Make sure gfs2_glock_put() won't sleep under the file->f_lock * spinlock. */ - gfs2_glock_hold(gl); spin_lock(&file->f_lock); gfs2_holder_uninit(fl_gh); spin_unlock(&file->f_lock); |