diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 08:27:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 08:27:30 -0700 |
| commit | b33ecba033ca649f6350696a3057d916a23a775a (patch) | |
| tree | c73dec9bdacace464a6df43b14c4f0dfc0d2a607 | |
| parent | 81ca98036985559c49480007371af94aa6e85dc0 (diff) | |
| parent | e56985da455b9dc0591b8cb2006cc94b6f4fb0f4 (diff) | |
| download | op-kernel-dev-b33ecba033ca649f6350696a3057d916a23a775a.zip op-kernel-dev-b33ecba033ca649f6350696a3057d916a23a775a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix page_mkwrite() return code
GFS2: Clear dirty bit at end of inode glock sync
| -rw-r--r-- | fs/gfs2/glops.c | 6 | ||||
| -rw-r--r-- | fs/gfs2/ops_file.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index bf23a62..70f87f4 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -156,6 +156,12 @@ static void inode_go_sync(struct gfs2_glock *gl) error = filemap_fdatawait(metamapping); mapping_set_error(metamapping, error); gfs2_ail_empty_gl(gl); + /* + * Writeback of the data mapping may cause the dirty flag to be set + * so we have to clear it again here. + */ + smp_mb__before_clear_bit(); + clear_bit(GLF_DIRTY, &gl->gl_flags); } /** diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 101caf3..5d82e91 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c @@ -413,7 +413,9 @@ out_unlock: gfs2_glock_dq(&gh); out: gfs2_holder_uninit(&gh); - if (ret) + if (ret == -ENOMEM) + ret = VM_FAULT_OOM; + else if (ret) ret = VM_FAULT_SIGBUS; return ret; } |
