mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
		
							parent
							
								
									da1dafca84
								
							
						
					
					
						commit
						6e3617e579
					
				
					 1 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
					@ -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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue