diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /fs/f2fs/data.c | |
parent | Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/... (diff) | |
parent | Linux 4.2-rc7 (diff) | |
download | linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.xz linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'fs/f2fs/data.c')
-rw-r--r-- | fs/f2fs/data.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 9bedfa8dd3a5..f71e19a9dd3c 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2072,8 +2072,6 @@ static int f2fs_set_data_page_dirty(struct page *page) return 1; } - mark_inode_dirty(inode); - if (!PageDirty(page)) { __set_page_dirty_nobuffers(page); update_dirty_page(inode, page); |