OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Ken Sumrall [Tue, 12 Jun 2012 19:53:13 +0000 (12:53 -0700)]
am
a8948fce: Revert "Better fix for marking fs err in superblock if err set in journal superblock."
* commit '
a8948fce2be374a697f38bcefc8c33271b83b432':
Revert "Better fix for marking fs err in superblock if err set in journal superblock."
Ken Sumrall [Mon, 11 Jun 2012 19:45:17 +0000 (12:45 -0700)]
Revert "Better fix for marking fs err in superblock if err set in journal superblock."
This reverts commit
46e96be157785a3582844efb27f4eef38943400b.
Ken Sumrall [Thu, 7 Jun 2012 20:25:12 +0000 (13:25 -0700)]
am
46e96be1: Better fix for marking fs err in superblock if err set in journal superblock.
* commit '
46e96be157785a3582844efb27f4eef38943400b':
Better fix for marking fs err in superblock if err set in journal superblock.
Ken Sumrall [Tue, 5 Jun 2012 18:59:36 +0000 (11:59 -0700)]
Better fix for marking fs err in superblock if err set in journal superblock.
The previous fix of flushing out the superblock after setting the
EXT2_ERROR_FS flag was erroneous because running the journal could have
updated the superblock (but not the in-memory copy the code referenced).
So instead, check the journal error conditions after running the journal
and freeing and re-opening the filesystem. Also, make sure to flush
the error state of the superblock to disk before clearing the error state
of the journal.
Change-Id: Ia5cde1a367d86992c9bd3bca652a1289935d1380
Ken Sumrall [Tue, 5 Jun 2012 02:08:12 +0000 (19:08 -0700)]
am
8c157a2c: Fix e2fsck to run a full check if only the journal has recorded an error
* commit '
8c157a2c73b27b3f3ae566be78279460a35ccbc1':
Fix e2fsck to run a full check if only the journal has recorded an error
Ken Sumrall [Tue, 5 Jun 2012 01:38:29 +0000 (18:38 -0700)]
Fix e2fsck to run a full check if only the journal has recorded an error
If only the journal superblock had recorded an error, but not the ext4
superblock, e2fsck would mark the superblock as containing an error.
However, it was never flushed to disk before e2fsck restarted itself
after recovering the journal, and the full check didn't happen.
Change-Id: I2952b50d3f27c6b72b6167903dbc5a26c188df0c
Jean-Baptiste Queru [Sat, 5 May 2012 01:09:23 +0000 (18:09 -0700)]
am
3e60e44f: Merge "Xcode 4.3 compatibility checkin"
* commit '
3e60e44fae35febb9da905394698b21b45ad7301':
Xcode 4.3 compatibility checkin
Jean-Baptiste Queru [Fri, 4 May 2012 21:10:53 +0000 (14:10 -0700)]
Merge "Xcode 4.3 compatibility checkin"
Al Sutton [Thu, 23 Feb 2012 18:23:10 +0000 (18:23 +0000)]
Xcode 4.3 compatibility checkin
Compilation on Xcode 4.3 does not handle inlined functions well and so the
compile fails.
This patch ensures that inlines are not used on that compiler.
Signed-off-by: Al Sutton <al@funkyandroid.com>
Ying Wang [Tue, 8 Nov 2011 03:29:23 +0000 (19:29 -0800)]
Stop use of LOCAL_MODULE_STEM for libraries.
Bug:
5573756
The uses of LOCAL_MODULE_STEM are unnecessary here.
To implement the feature requested by bug
5573756, we need library
name to be the same as its module name.
Change-Id: Ibbea9c1e1f4f8f2f5af0b467787ccb214c47d3fd
David 'Digit' Turner [Wed, 13 Jul 2011 21:55:30 +0000 (14:55 -0700)]
am
e20724c9: resolved conflicts for merge of
3154443d to gingerbread-plus-aosp
* commit '
e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72':
Change systembuilder tag to optional
Jeff Brown [Tue, 12 Jul 2011 05:11:58 +0000 (22:11 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I335bcedd2aeab7da8e26ba975de6e02bfc062ee8
David 'Digit' Turner [Mon, 11 Jul 2011 23:23:22 +0000 (01:23 +0200)]
resolved conflicts for merge of
3154443d to gingerbread-plus-aosp
Change-Id: I9f547b2e5ea97a503abd7a6a18811af309913345
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
Bruce Beare [Tue, 29 Jun 2010 18:27:56 +0000 (11:27 -0700)]
Change systembuilder tag to optional
Orig-Change-Id: Ieb530c78ddd3968760eea209a4f02c9e9b781134
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Sat, 7 May 2011 00:53:55 +0000 (17:53 -0700)]
Revert "external/e2fsprogs: remove LOCAL_PRELINK_MODULE"
This reverts commit
89a994149ee53292ea7d9557f20d3828dc4aad3d.
Iliyan Malchev [Mon, 14 Mar 2011 21:02:09 +0000 (14:02 -0700)]
external/e2fsprogs: remove LOCAL_PRELINK_MODULE
Change-Id: Ic60cf9128945baa7319253e63b12b97ad230dc40
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Sat, 29 Jan 2011 04:19:45 +0000 (20:19 -0800)]
ext4_utils: Convert all build target tags to optional
A typo in the build target tags was causing them all to be
left blank. use_e2fsprogs_module_tags is unused now, so
change all targets to optional.
Change-Id: Ie6cf18b8443c9b09b8b9e88fac3569b5527fec64
Jean-Baptiste Queru [Fri, 2 Jul 2010 19:05:24 +0000 (12:05 -0700)]
resolved conflicts for merge of
5ea5bedd to master
Change-Id: I3238fb8cf7fcf6a20c53b59e27bcb68af7d44060
Bruce Beare [Tue, 29 Jun 2010 18:27:56 +0000 (11:27 -0700)]
Change systembuilder tag to optional
Change-Id: Ieb530c78ddd3968760eea209a4f02c9e9b781134
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Colin Cross [Thu, 17 Jun 2010 21:53:13 +0000 (14:53 -0700)]
Make ext2 utils available to all builds
Change-Id: I7aa64ec932982ec22febe7300750da50525a71c6
Nick Pelly [Wed, 12 May 2010 01:15:43 +0000 (18:15 -0700)]
Fix build for darwin host.
Change-Id: I7c73c5c99b25e66ead23e3201790bb9735f36ce5
Colin Cross [Fri, 7 May 2010 07:32:38 +0000 (00:32 -0700)]
e2fsprogs: Build for host and target
Change-Id: I7e4a7893b5b30ca4117b659e2a6b339c1c278c24
Colin Cross [Fri, 7 May 2010 01:31:19 +0000 (18:31 -0700)]
Add e2fsck/crc32table.h and remove .gitignore
Change-Id: Ieaef3fa6a0a6c5ed272d18c885b47aa873652d31
Dmitry Shmidt [Thu, 6 May 2010 21:42:16 +0000 (14:42 -0700)]
e2fsprogs: Update to Version 1.44.11
Change-Id: Ie9b7d1fdfcc2374d292c75d6ea38d073f8d85ac6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 5 May 2010 19:57:27 +0000 (12:57 -0700)]
e2fsprogs: Add option to choose USE_E2FSPROGS
Change-Id: I63eee7a6cd84c383386260d63ac91237c801b260
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:21 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: I34c5eeb7807bb1756852d54768f46dc9e0c8c14f
The Android Open Source Project [Fri, 5 Feb 2010 16:49:13 +0000 (08:49 -0800)]
am
06998459: reconcile main tree with open-source eclair
Merge commit '
0699845953d8a6d6ad52beaef39cd78fe04eefb8' into eclair-plus-aosp
* commit '
0699845953d8a6d6ad52beaef39cd78fe04eefb8':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:33 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:07:56 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:18:20 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Android Code Review [Mon, 14 Sep 2009 17:47:29 +0000 (10:47 -0700)]
Merge change 9990
* changes:
e2fsprogs: Build if TARGET_ARCH is x86.
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:54 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 00:48:01 +0000 (17:48 -0700)]
Merge korg/donut into korg/master
Chia-I Wu [Mon, 18 May 2009 06:18:12 +0000 (14:18 +0800)]
e2fsprogs: Build if TARGET_ARCH is x86.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:13 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:51 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:17 +0000 (17:12 -0700)]
Merge donut into master
The Android Open Source Project [Sun, 29 Mar 2009 15:55:05 +0000 (08:55 -0700)]
Merge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project [Fri, 27 Mar 2009 22:30:36 +0000 (15:30 -0700)]
Merge commit 'korg/cupcake'
San Mehat [Wed, 25 Mar 2009 05:36:23 +0000 (22:36 -0700)]
Automated import from //branches/master/...@142325,142325
San Mehat [Wed, 25 Mar 2009 05:28:37 +0000 (22:28 -0700)]
Automated import from //branches/donutburger/...@142324,142324
San Mehat [Wed, 25 Mar 2009 02:22:53 +0000 (19:22 -0700)]
Automated import from //branches/cupcake/...@142323,142323
Jean-Baptiste Queru [Wed, 18 Mar 2009 23:57:33 +0000 (16:57 -0700)]
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
The Android Open Source Project [Wed, 4 Mar 2009 03:29:25 +0000 (19:29 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:21 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 10 Feb 2009 23:43:58 +0000 (15:43 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Sat, 10 Jan 2009 02:04:14 +0000 (18:04 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 01:51:20 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Thu, 18 Dec 2008 02:04:13 +0000 (18:04 -0800)]
Code drop from //branches/cupcake/...@124589