shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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"
This commit is contained in:
Linus Torvalds
2022-02-11 11:36:32 -08:00
parent cf26a2360a d3add1a951
commit 8ce964b520
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/gfs2/file.c
View File

@@ -704,10 +704,11 @@ static int gfs2_release(struct inode *inode, struct file *file)
kfree(file->private_data); kfree(file->private_data);
file->private_data = NULL; file->private_data = NULL;
if (gfs2_rs_active(&ip->i_res)) if (file->f_mode & FMODE_WRITE) {
gfs2_rs_delete(ip, &inode->i_writecount); if (gfs2_rs_active(&ip->i_res))
if (file->f_mode & FMODE_WRITE) gfs2_rs_delete(ip, &inode->i_writecount);
gfs2_qa_put(ip); gfs2_qa_put(ip);
}
return 0; return 0;
} }

3
fs/gfs2/glock.c
View File

@@ -301,9 +301,6 @@ void gfs2_glock_queue_put(struct gfs2_glock *gl)
void gfs2_glock_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)) if (lockref_put_or_lock(&gl->gl_lockref))
return; return;