diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-01 17:20:40 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-01 17:20:40 -1000 |
| commit | 00151f515adda740f4688c529eca61a20359903a (patch) | |
| tree | 0cb53d5d6e76f58209f3d9445f41192734307922 | |
| parent | 4d96d3b0efee6416ef0d61b76aaac6f4a2e15b12 (diff) | |
| parent | d5b8145455c629e7f157d2da46a9b2fba483f235 (diff) | |
| download | linux-00151f515adda740f4688c529eca61a20359903a.tar.gz linux-00151f515adda740f4688c529eca61a20359903a.tar.bz2 linux-00151f515adda740f4688c529eca61a20359903a.zip | |
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"
| -rw-r--r-- | fs/gfs2/file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 8a35a0196b6d..493a83e3f590 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -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); |