Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a25efd8e authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

Revert "f2fs: introduce f2fs_set_page_dirty_nobuffer" 



Cherry-pick from origin/upstream-f2fs-stable-linux-4.9.y:
commit 95459e9e ("Revert "f2fs: introduce f2fs_set_page_dirty_nobuffer"")

This patch reverts copied f2fs_set_page_dirty_nobuffer to use generic function
for stability.

This reverts commit fe76b796.

Change-Id: I2d31d13eb14b2672f8d3c74c16c759ebbb6a1d32
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent efeffe9d

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int f2fs_set_meta_page_dirty(struct page *page) 
	if (!PageUptodate(page))

		SetPageUptodate(page);

	if (!PageDirty(page)) {

		f2fs_set_page_dirty_nobuffers(page);

		__set_page_dirty_nobuffers(page);

		inc_page_count(F2FS_P_SB(page), F2FS_DIRTY_META);

		SetPagePrivate(page);

		f2fs_trace_pid(page);

fs/f2fs/data.c

+1 −32
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/bio.h>

#include <linux/prefetch.h>

#include <linux/uio.h>

#include <linux/mm.h>

#include <linux/memcontrol.h>

#include <linux/cleancache.h>



#include "f2fs.h"
@@ -2514,35 +2512,6 @@ int f2fs_release_page(struct page *page, gfp_t wait) 
	return 1;

}



/*

 * This was copied from __set_page_dirty_buffers which gives higher performance

 * in very high speed storages. (e.g., pmem)

 */

void f2fs_set_page_dirty_nobuffers(struct page *page)

{

	struct address_space *mapping = page->mapping;

	unsigned long flags;



	if (unlikely(!mapping))

		return;



	spin_lock(&mapping->private_lock);

	lock_page_memcg(page);

	SetPageDirty(page);

	spin_unlock(&mapping->private_lock);



	spin_lock_irqsave(&mapping->tree_lock, flags);

	WARN_ON_ONCE(!PageUptodate(page));

	account_page_dirtied(page, mapping);

	radix_tree_tag_set(&mapping->page_tree,

			page_index(page), PAGECACHE_TAG_DIRTY);

	spin_unlock_irqrestore(&mapping->tree_lock, flags);

	unlock_page_memcg(page);



	__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);

	return;

}



static int f2fs_set_data_page_dirty(struct page *page)

{

	struct address_space *mapping = page->mapping;
@@ -2566,7 +2535,7 @@ static int f2fs_set_data_page_dirty(struct page *page) 
	}



	if (!PageDirty(page)) {

		f2fs_set_page_dirty_nobuffers(page);

		__set_page_dirty_nobuffers(page);

		update_dirty_page(inode, page);

		return 1;

	}

fs/f2fs/f2fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2919,7 +2919,6 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
			u64 start, u64 len);

bool should_update_inplace(struct inode *inode, struct f2fs_io_info *fio);

bool should_update_outplace(struct inode *inode, struct f2fs_io_info *fio);

void f2fs_set_page_dirty_nobuffers(struct page *page);

int __f2fs_write_data_pages(struct address_space *mapping,

						struct writeback_control *wbc,

						enum iostat_type io_type);

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ static int f2fs_set_node_page_dirty(struct page *page) 
	if (!PageUptodate(page))

		SetPageUptodate(page);

	if (!PageDirty(page)) {

		f2fs_set_page_dirty_nobuffers(page);

		__set_page_dirty_nobuffers(page);

		inc_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);

		SetPagePrivate(page);

		f2fs_trace_pid(page);