From: Chris Mason Date: Fri, 11 Sep 2009 16:33:12 +0000 (-0400) Subject: Btrfs: fix btrfs page_mkwrite to return locked page X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50a9b214bc6c052caa05a210ebfc1bdf0d7085b2;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Btrfs: fix btrfs page_mkwrite to return locked page This closes a whole where the page may be written before the page_mkwrite caller has a chance to dirty it (thanks to Nick Piggin) Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 233fe6f26120..c846482e7985 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4552,11 +4552,14 @@ again: } ClearPageChecked(page); set_page_dirty(page); + SetPageUptodate(page); BTRFS_I(inode)->last_trans = root->fs_info->generation + 1; unlock_extent(io_tree, page_start, page_end, GFP_NOFS); out_unlock: + if (!ret) + return VM_FAULT_LOCKED; unlock_page(page); out: return ret;