adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-03 22:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GFS2] Fix for mmap() bug in readpage

Browse source 
Fix for Red Hat bz 205307. Don't need to lock in readpage if
the higher level code has already grabbed the lock.

Signed-off-by: Russell Cattelan <cattelan@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Russell Cattelan 2006-09-18 17:26:48 -04:00 committed by Steven Whitehouse
parent 7a6bbacbb8
commit dc41aeedef
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/gfs2/ops_address.c
View file

@ -218,14 +218,16 @@ static int gfs2_readpage(struct file *file, struct page *page)
{ {
struct gfs2_inode *ip = GFS2_I(page->mapping->host); struct gfs2_inode *ip = GFS2_I(page->mapping->host);
struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host); struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
struct gfs2_file *gf = NULL;
struct gfs2_holder gh; struct gfs2_holder gh;
int error; int error;
int do_unlock = 0; int do_unlock = 0;
if (likely(file != &gfs2_internal_file_sentinel)) { if (likely(file != &gfs2_internal_file_sentinel)) {
if (file) { if (file) {
struct gfs2_file *gf = file->private_data; gf = file->private_data;
if (test_bit(GFF_EXLOCK, &gf->f_flags)) if (test_bit(GFF_EXLOCK, &gf->f_flags))
/* gfs2_sharewrite_nopage has grabbed the ip->i_gl already */
goto skip_lock; goto skip_lock;
} }
gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh); gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|GL_AOP, &gh);
@ -245,7 +247,8 @@ skip_lock:
if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
error = -EIO; error = -EIO;
if (file != &gfs2_internal_file_sentinel) { if (gf && !test_bit(GFF_EXLOCK, &gf->f_flags) &&
file != &gfs2_internal_file_sentinel) {
gfs2_glock_dq_m(1, &gh); gfs2_glock_dq_m(1, &gh);
gfs2_holder_uninit(&gh); gfs2_holder_uninit(&gh);
} }