move marking inode dirty to the end of __ufs_truncate_blocks() (b6eede0e) · Commits · e / devices / android_kernel_fairphone_FP5

fs/ufs/inode.c

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1027,7 +1027,6 @@ static void ufs_trunc_direct(struct inode *inode)
	frag1 = ufs_fragnum (frag1);		frag1 = ufs_fragnum (frag1);

	ufs_free_fragments(inode, tmp + frag1, frag2);		ufs_free_fragments(inode, tmp + frag1, frag2);
	mark_inode_dirty(inode);

	next1:		next1:
	/*		/*
	@@ -1043,7 +1042,6 @@ static void ufs_trunc_direct(struct inode *inode)
	write_sequnlock(&ufsi->meta_lock);		write_sequnlock(&ufsi->meta_lock);

	free_data(&ctx, tmp, uspi->s_fpb);		free_data(&ctx, tmp, uspi->s_fpb);
	mark_inode_dirty(inode);
	}		}

	free_data(&ctx, 0, 0);		free_data(&ctx, 0, 0);
	@@ -1064,7 +1062,6 @@ static void ufs_trunc_direct(struct inode *inode)
	write_sequnlock(&ufsi->meta_lock);		write_sequnlock(&ufsi->meta_lock);

	ufs_free_fragments (inode, tmp, frag4);		ufs_free_fragments (inode, tmp, frag4);
	mark_inode_dirty(inode);
	next3:		next3:

	UFSD("EXIT: ino %lu\n", inode->i_ino);		UFSD("EXIT: ino %lu\n", inode->i_ino);
	@@ -1104,7 +1101,6 @@ static void free_full_branch(struct inode *inode, u64 ind_block, int depth)
	write_sequnlock(&UFS_I(inode)->meta_lock);		write_sequnlock(&UFS_I(inode)->meta_lock);
	ubh_mark_buffer_dirty(ubh);		ubh_mark_buffer_dirty(ubh);
	free_data(&ctx, block, uspi->s_fpb);		free_data(&ctx, block, uspi->s_fpb);
	mark_inode_dirty(inode);
	}		}
	}		}
	free_data(&ctx, 0, 0);		free_data(&ctx, 0, 0);
	@@ -1112,7 +1108,6 @@ static void free_full_branch(struct inode *inode, u64 ind_block, int depth)

	ubh_bforget(ubh);		ubh_bforget(ubh);
	ufs_free_blocks(inode, ind_block, uspi->s_fpb);		ufs_free_blocks(inode, ind_block, uspi->s_fpb);
	mark_inode_dirty(inode);
	}		}

	static void free_branch_tail(struct inode inode, unsigned from, struct ufs_buffer_head ubh, int depth)		static void free_branch_tail(struct inode inode, unsigned from, struct ufs_buffer_head ubh, int depth)
	@@ -1145,7 +1140,6 @@ static void free_branch_tail(struct inode *inode, unsigned from, struct ufs_buff
	write_sequnlock(&UFS_I(inode)->meta_lock);		write_sequnlock(&UFS_I(inode)->meta_lock);
	ubh_mark_buffer_dirty(ubh);		ubh_mark_buffer_dirty(ubh);
	free_data(&ctx, block, uspi->s_fpb);		free_data(&ctx, block, uspi->s_fpb);
	mark_inode_dirty(inode);
	}		}
	}		}
	free_data(&ctx, 0, 0);		free_data(&ctx, 0, 0);
	@@ -1283,6 +1277,7 @@ static void __ufs_truncate_blocks(struct inode *inode)
	}		}
	}		}
	ufsi->i_lastfrag = DIRECT_FRAGMENT;		ufsi->i_lastfrag = DIRECT_FRAGMENT;
			mark_inode_dirty(inode);
	mutex_unlock(&ufsi->truncate_mutex);		mutex_unlock(&ufsi->truncate_mutex);
	}		}