diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-07-06 00:09:27 -0400 |
| commit | 7f7d1cb462789eef8e359caa46523ed6b99255e1 (patch) | |
| tree | e23923e05256deb1712ff21d4799312a0a6f1142 /e2fsck/e2fsck.h | |
| parent | 328731738d88eb6c32c784e7aa7871e576e9e8a5 (diff) | |
| parent | cd75fb04510073004f8ef005e06733813faad2de (diff) | |
| download | android_external_e2fsprogs-7f7d1cb462789eef8e359caa46523ed6b99255e1.tar.gz android_external_e2fsprogs-7f7d1cb462789eef8e359caa46523ed6b99255e1.tar.bz2 android_external_e2fsprogs-7f7d1cb462789eef8e359caa46523ed6b99255e1.zip | |
Merge branch 'maint' into next
Conflicts:
debugfs/set_fields.c
tests/f_mmp/script
tests/f_mmp_garbage/script
tests/m_mmp/script
tests/t_mmp_1on/script
tests/t_mmp_2off/script
Diffstat (limited to 'e2fsck/e2fsck.h')
| -rw-r--r-- | e2fsck/e2fsck.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 331306f1..80ab18aa 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -232,6 +232,7 @@ struct e2fsck_struct { blk64_t free_blocks; ino_t free_inodes; int mount_flags; + int openfs_flags; blkid_cache blkid; /* blkid cache */ #ifdef HAVE_SETJMP_H |