system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-17 00:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert broken commit

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEEJZs3krPW0xkhLMTc1b+f6wMTZToFAmC2o+MUHGFncnVlbmJh
 QHJlZGhhdC5jb20ACgkQ1b+f6wMTZTqTKQ/9FQ3I5Q32cwyb1oFJbZ2avBsN948Z
 kjeBbCEg0W4j0Bsp9uxAm/qzgW6rAurMsoNK5G1DK4GbsTfdZbCkscX3kMVGbHzA
 PngT3CuoHDzghoGLc5kh9COnbyCN1EfSdbjkRRp6SYSkkY93YMcQruK7DV9cY2Kb
 2jDySAsAACooxRUNNk8eE04lNydJ4d6yTkcxhMliI/LQ8mLDyuY2fZWP+X7HGUIy
 nWOoz51sNJKK738+Fo/Wj6ppmqnvEgBNBVmGbeOwpwrFZiCaah2eBmh8FwvUe2Hg
 EtgU//TJBxaf8b/VIJg/ZDKpWCLy+7HQjSuSHM6XSTwuThJXalo1DGiZV+v8RF0q
 +Og4kF+s6k2U6A2RCiT/jgjg1tPwf52cPG2dJGKnvy4/yyDihcP96bDvenjEFBhx
 dUcWNBtuxcbACGlFoky6Y1er2tvWF5PrzB4zHZSVfoFAvXA607MJW4OMta0kfM5O
 COuD159j7Otc83+3PjiHZn5gB+NwHMuoJTwe4PWKKCYBdKT48yLmJ4Ud69uTVHSy
 F+SOhAuvchEtW4FH95pdzlbCdYgUGzpTdAveVq26Y4pp5fbZZoOY94Etwismri7j
 Q4sS7gLr6BsL09nbj1Snsu6MC1z5KoDJVtS8a8BSIaHnlF4GHDryxukS40p3Un70
 VzAmlGnTbWgrW8g=
 =DUZI
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2021-06-01 17:20:40 -10:00
parent 4d96d3b0ef d5b8145455
commit 00151f515a
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/gfs2/file.c
View file

@ -540,11 +540,9 @@ static vm_fault_t gfs2_fault(struct vm_fault *vmf)
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh; struct gfs2_holder gh;
vm_fault_t ret; vm_fault_t ret;
u16 state;
int err; int err;
state = (vmf->flags & FAULT_FLAG_WRITE) ? LM_ST_EXCLUSIVE : LM_ST_SHARED; gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);
gfs2_holder_init(ip->i_gl, state, 0, &gh);
err = gfs2_glock_nq(&gh); err = gfs2_glock_nq(&gh);
if (err) { if (err) {
ret = block_page_mkwrite_return(err); ret = block_page_mkwrite_return(err);