From 79a7bae62154eb9962b07765406ac7ed4eb4dfa3 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 19 Mar 2009 13:15:44 +0000 Subject: [PATCH] --- yaml --- r: 133251 b: refs/heads/master c: 9c538837d844574787c95bd5665f684559fb7065 h: refs/heads/master i: 133249: 0d95d4f93d5fc488fd575dc2da12d0d8033212f4 133247: cdcff019ff3ebeb8bc4e7dd30138f651c01fbdb9 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/ops_file.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfce861d83f1..677f5852d30d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bac243f0793499782267342eba852a8a6cc7ac4 +refs/heads/master: 9c538837d844574787c95bd5665f684559fb7065 diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c index 48ec3d5e29eb..3b9e8de3500b 100644 --- a/trunk/fs/gfs2/ops_file.c +++ b/trunk/fs/gfs2/ops_file.c @@ -355,6 +355,9 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) if (ret) goto out; + set_bit(GLF_DIRTY, &ip->i_gl->gl_flags); + set_bit(GIF_SW_PAGED, &ip->i_flags); + ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required); if (ret || !alloc_required) goto out_unlock; @@ -395,8 +398,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page) goto out_unlock_page; } ret = gfs2_allocate_page_backing(page); - if (!ret) - set_bit(GIF_SW_PAGED, &ip->i_flags); out_unlock_page: unlock_page(page);