Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 (4ef5c68f) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/nilfs2/gcinode.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -176,7 +176,6 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *bh)
		int nilfs_init_gcinode(struct inode *inode)
		{
		struct nilfs_inode_info *ii = NILFS_I(inode);
		struct the_nilfs *nilfs = NILFS_SB(inode->i_sb)->s_nilfs;

		inode->i_mode = S_IFREG;
		mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);
		@@ -186,14 +185,6 @@ int nilfs_init_gcinode(struct inode *inode)
		ii->i_flags = 0;
		nilfs_bmap_init_gc(ii->i_bmap);

		/*
		* Add the inode to GC inode list. Garbage Collection
		* is serialized and no two processes manipulate the
		* list simultaneously.
		*/
		igrab(inode);
		list_add(&NILFS_I(inode)->i_dirty, &nilfs->ns_gc_inodes);

		return 0;
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -337,6 +337,7 @@ static int nilfs_ioctl_move_blocks(struct super_block *sb,
		struct nilfs_argv argv, void buf)
		{
		size_t nmembs = argv->v_nmembs;
		struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs;
		struct inode *inode;
		struct nilfs_vdesc *vdesc;
		struct buffer_head bh, n;
		@@ -353,6 +354,17 @@ static int nilfs_ioctl_move_blocks(struct super_block *sb,
		ret = PTR_ERR(inode);
		goto failed;
		}
		if (list_empty(&NILFS_I(inode)->i_dirty)) {
		/*
		* Add the inode to GC inode list. Garbage Collection
		* is serialized and no two processes manipulate the
		* list simultaneously.
		*/
		igrab(inode);
		list_add(&NILFS_I(inode)->i_dirty,
		&nilfs->ns_gc_inodes);
		}

		do {
		ret = nilfs_ioctl_move_inode_block(inode, vdesc,
		&buffers);