Skip to content

Commit 8ce964b

Browse files
committed
Merge tag 'gfs2-v5.16-rc3-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fixes from Andreas Gruenbacher: - Revert debug commit that causes unexpected data corruption - Fix muti-block reservation regression * tag 'gfs2-v5.16-rc3-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: gfs2: Fix gfs2_release for non-writers regression Revert "gfs2: check context in gfs2_glock_put"
2 parents cf26a23 + d3add1a commit 8ce964b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

fs/gfs2/file.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,10 +704,11 @@ static int gfs2_release(struct inode *inode, struct file *file)
704704
kfree(file->private_data);
705705
file->private_data = NULL;
706706

707-
if (gfs2_rs_active(&ip->i_res))
708-
gfs2_rs_delete(ip, &inode->i_writecount);
709-
if (file->f_mode & FMODE_WRITE)
707+
if (file->f_mode & FMODE_WRITE) {
708+
if (gfs2_rs_active(&ip->i_res))
709+
gfs2_rs_delete(ip, &inode->i_writecount);
710710
gfs2_qa_put(ip);
711+
}
711712
return 0;
712713
}
713714

fs/gfs2/glock.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,6 @@ void gfs2_glock_queue_put(struct gfs2_glock *gl)
301301

302302
void gfs2_glock_put(struct gfs2_glock *gl)
303303
{
304-
/* last put could call sleepable dlm api */
305-
might_sleep();
306-
307304
if (lockref_put_or_lock(&gl->gl_lockref))
308305
return;
309306

0 commit comments

Comments
 (0)