diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2011-02-27 19:47:44 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-02-27 19:47:44 -0500 |
| commit | 829d9994880394e48c883510799b1536812d6efb (patch) | |
| tree | e21afba233d49f4fcf600bd6b632610297e70368 /ext2ed | |
| parent | 7d9e31655fca48e9d6c2647ad443124113508b73 (diff) | |
| parent | 412376efff3c0e0c2fea00666c2457e6f2ae1878 (diff) | |
| download | e2fsprogs-829d9994880394e48c883510799b1536812d6efb.tar.gz | |
Merge branch 'maint' into next
Conflicts:
lib/ext2fs/initialize.c
Diffstat (limited to 'ext2ed')
| -rw-r--r-- | ext2ed/inode_com.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext2ed/inode_com.c b/ext2ed/inode_com.c index 843286c5..8d4b9f33 100644 --- a/ext2ed/inode_com.c +++ b/ext2ed/inode_com.c @@ -222,11 +222,11 @@ void type_ext2_inode___show (char *command_line) case EXT2_ROOT_INO: wprintw (show_win,"Root inode - "); break; - case EXT2_ACL_IDX_INO: - wprintw (show_win,"ACL index inode - "); + case EXT4_USR_QUOTA_INO: + wprintw (show_win,"User quota inode - "); break; - case EXT2_ACL_DATA_INO: - wprintw (show_win,"ACL data inode - "); + case EXT4_GRP_QUOTA_INO: + wprintw (show_win,"Group quota inode - "); break; case EXT2_BOOT_LOADER_INO: wprintw (show_win,"Boot loader inode - "); |