Commit 00151f51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-v5.13-rc2-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 fix from Andreas Gruenbacher:
 "Revert broken commit"

* tag 'gfs2-v5.13-rc2-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  Revert "gfs2: Fix mmap locking for write faults"
parents 4d96d3b0 d5b81454

fs/gfs2/file.c

+1 −3
Original line number Diff line number Diff line
@@ -540,11 +540,9 @@ static vm_fault_t gfs2_fault(struct vm_fault *vmf) 
	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_holder gh;

	vm_fault_t ret;

	u16 state;

	int err;



	state = (vmf->flags & FAULT_FLAG_WRITE) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;

	gfs2_holder_init(ip->i_gl, state, 0, &gh);

	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	err = gfs2_glock_nq(&gh);

	if (err) {

		ret = block_page_mkwrite_return(err);