Commit 8ce964b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents cf26a236 d3add1a9

fs/gfs2/file.c

+4 −3
Original line number Diff line number Diff line
@@ -704,10 +704,11 @@ static int gfs2_release(struct inode *inode, struct file *file) 
	kfree(file->private_data);

	file->private_data = NULL;



	if (file->f_mode & FMODE_WRITE) {

		if (gfs2_rs_active(&ip->i_res))

			gfs2_rs_delete(ip, &inode->i_writecount);

	if (file->f_mode & FMODE_WRITE)

		gfs2_qa_put(ip);

	}

	return 0;

}

fs/gfs2/glock.c

+0 −3
Original line number Diff line number Diff line
@@ -301,9 +301,6 @@ void gfs2_glock_queue_put(struct gfs2_glock *gl) 


void gfs2_glock_put(struct gfs2_glock *gl)

{

	/* last put could call sleepable dlm api */

	might_sleep();



	if (lockref_put_or_lock(&gl->gl_lockref))

		return;