Skip to content

Commit 00151f5

Browse files
committed
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"
2 parents 4d96d3b + d5b8145 commit 00151f5

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

fs/gfs2/file.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,9 @@ static vm_fault_t gfs2_fault(struct vm_fault *vmf)
540540
struct gfs2_inode *ip = GFS2_I(inode);
541541
struct gfs2_holder gh;
542542
vm_fault_t ret;
543-
u16 state;
544543
int err;
545544

546-
state = (vmf->flags & FAULT_FLAG_WRITE) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;
547-
gfs2_holder_init(ip->i_gl, state, 0, &gh);
545+
gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);
548546
err = gfs2_glock_nq(&gh);
549547
if (err) {
550548
ret = block_page_mkwrite_return(err);

0 commit comments

Comments
 (0)