Commit 6e3617e5 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: Handle non empty on-disk orphan link 



In case of truncate errors we explicitly remove inode from in-core
orphan list via orphan_del(NULL, inode) without modifying the on-disk list.

But later on, the same inode may be inserted in the orphan list again
which will result the on-disk linked list getting corrupted.  If inode
i_dtime contains valid value, then skip on-disk list modification.

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent da1dafca

fs/ext4/namei.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -2013,6 +2013,13 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) 
	err = ext4_reserve_inode_write(handle, inode, &iloc);

	err = ext4_reserve_inode_write(handle, inode, &iloc);

	if (err)

	if (err)

		goto out_unlock;

		goto out_unlock;

	/*

	 * Due to previous errors inode may be already a part of on-disk

	 * orphan list. If so skip on-disk list modification.

	 */

	if (NEXT_ORPHAN(inode) && NEXT_ORPHAN(inode) <=

		(le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count)))

			goto mem_insert;





	/* Insert this inode at the head of the on-disk orphan list... */

	/* Insert this inode at the head of the on-disk orphan list... */

	NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan);

	NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan);
@@ -2030,6 +2037,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) 
	 *

	 *

	 * This is safe: on error we're going to ignore the orphan list

	 * This is safe: on error we're going to ignore the orphan list

	 * anyway on the next recovery. */

	 * anyway on the next recovery. */

mem_insert:

	if (!err)

	if (!err)

		list_add(&EXT4_I(inode)->i_orphan, &EXT4_SB(sb)->s_orphan);

		list_add(&EXT4_I(inode)->i_orphan, &EXT4_SB(sb)->s_orphan);

CRA Git | Maintained and supported by SUSTech CRA and CCSE