OSDN Git Service
Nick Kralevich [Sat, 23 Feb 2013 02:31:44 +0000 (18:31 -0800)]
am
554ed4fa: Merge "ext4_utils: add filesystem capabilities support."
* commit '
554ed4fae98783a3c01880aed00ad415a0976029':
ext4_utils: add filesystem capabilities support.
Nick Kralevich [Sat, 23 Feb 2013 02:03:53 +0000 (02:03 +0000)]
Merge "ext4_utils: add filesystem capabilities support."
Nick Kralevich [Thu, 7 Feb 2013 22:21:34 +0000 (14:21 -0800)]
ext4_utils: add filesystem capabilities support.
Add support for specifying filesystem capabilities when
creating a new filesystem.
The combination of SELinux extended attributes plus
filesystem capability extended attributes is too big
to fit inside one inode entry. Because of this, I added
support to ext4_utils to create an xattr block and link
the inode to that block. We continue to try to fit
everything inside the inode if possible, but fall over to
creating a block if the extended attribute is too big.
Change-Id: I40ebb63975b15ecd8c565486e171b4d50cd4dfaa
Nick Kralevich [Wed, 20 Feb 2013 20:42:47 +0000 (12:42 -0800)]
am
f070d346: Merge "ext4_utils: clean up some warnings."
* commit '
f070d34601fa2f13e74897253be3a2b3681e4014':
ext4_utils: clean up some warnings.
Nick Kralevich [Wed, 20 Feb 2013 20:12:53 +0000 (20:12 +0000)]
Merge "ext4_utils: clean up some warnings."
Nick Kralevich [Wed, 20 Feb 2013 03:05:47 +0000 (19:05 -0800)]
ext4_utils: clean up some warnings.
Change-Id: Ia9761e5168cfe6baabc0105ea76d5575fc378f48
Elliott Hughes [Fri, 15 Feb 2013 00:17:37 +0000 (16:17 -0800)]
am
261e0f9c: Merge "Remove test_aligned.c. Nothing useful is being tested here."
# By Raghu Gandham
# Via Gerrit Code Review (1) and Raghu Gandham (1)
* commit '
261e0f9c260cd708e6b7e6f98a35ee9d31ebc01c':
Remove test_aligned.c. Nothing useful is being tested here.
Elliott Hughes [Thu, 14 Feb 2013 23:57:54 +0000 (23:57 +0000)]
Merge "Remove test_aligned.c. Nothing useful is being tested here."
Raghu Gandham [Thu, 14 Feb 2013 23:10:29 +0000 (15:10 -0800)]
Remove test_aligned.c. Nothing useful is being tested here.
Change-Id: I831b55bba93b7bf30febcd90c12d77c3d929fa51
Ken Sumrall [Wed, 14 Nov 2012 00:26:59 +0000 (16:26 -0800)]
A testing/debugging tool to wipe partitions
This is basically a command line tool version of the wipe_block_device()
function in libext4_utils. Useful for testing and/or debugging the
BLKSECDISCARD and BLKDISCARD ioctls.
Change-Id: I733f0f7daa673624ddbaac055d82b64d741acd70
Ken Sumrall [Fri, 8 Feb 2013 21:33:09 +0000 (13:33 -0800)]
A command to list md subsystem versions
This command was written to query the dm-crypt subsystem version,
but it prints out the version of all md subsystems currently running
in the kernel.
Change-Id: Iecf67c697c23b47b4a3f8f72df6048b87687c875
Ken Sumrall [Tue, 5 Feb 2013 22:45:10 +0000 (14:45 -0800)]
A new tool to test how many files can be opened simultaneously.
This tool will try to simultaneously open the specified number of files
in the specified directory. It is useful to check if hard limits are
high enough, and also check if a filesystem performs well when many files
are open at the same time. The sdcard daemon has some issues in this
area, both in max files that can be open at once, and performance
issues when too many are open.
Change-Id: I05a1ca49208f54a27d5405e4850752f49cdca443
Colin Cross [Tue, 5 Feb 2013 01:20:10 +0000 (17:20 -0800)]
am
ad9fd272: am
693a9667: Merge "ext4_utils: mark uninitialized inode tables in block groups"
# Via Android Git Automerger (1) and others
* commit '
ad9fd2723c20312ae0fc872e13c746c70ea91192':
ext4_utils: mark uninitialized inode tables in block groups
Colin Cross [Tue, 5 Feb 2013 00:22:23 +0000 (16:22 -0800)]
am
693a9667: Merge "ext4_utils: mark uninitialized inode tables in block groups"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '
693a966790d116812f44ee03250f031a53c294e1':
ext4_utils: mark uninitialized inode tables in block groups
Colin Cross [Mon, 4 Feb 2013 23:40:13 +0000 (23:40 +0000)]
Merge "ext4_utils: mark uninitialized inode tables in block groups"
Colin Cross [Mon, 4 Feb 2013 08:44:55 +0000 (00:44 -0800)]
ext4_utils: mark uninitialized inode tables in block groups
Block groups that have no used inodes have their inode table left
uninitialized, unless -t is specified, in which case they are
explicitly zeroed. When they are uninitialized, writing a sparse
ext4 image over existing data can cause e2fsck to confuse the
uninitialized data for lost inodes.
Set the EXT4_BG_INODE_UNINIT flags on block groups that have no
used inodes. This flag requires the block group checksum feature
to be enabled, so also enable the checksum feature in the superblock
and compute the checksum for the block group.
Since zeroing the inode tables is now useless, remove the code for
it and deprecate the -t command line option.
Change-Id: I4927c1d866d051547cf0dadc8c8703ded0163925
Iliyan Malchev [Sat, 2 Feb 2013 04:04:21 +0000 (04:04 +0000)]
Merge "Remove mdp_test"
Iliyan Malchev [Sat, 2 Feb 2013 04:03:36 +0000 (20:03 -0800)]
Remove mdp_test
Change-Id: I1fe32589c3bdbfe5f9d11b60394762c9f064735c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dianne Hackborn [Thu, 31 Jan 2013 23:07:43 +0000 (15:07 -0800)]
Update to follow activity manager implementation.
Change-Id: I12c40224f583e5778c02be55b1130c8591543ead
Colin Cross [Thu, 31 Jan 2013 02:06:29 +0000 (18:06 -0800)]
am
44c116d5: am
682a27cb: Merge "Fix root inode security labeling issue."
# By Robert Craig
# Via Android Git Automerger (1) and others
* commit '
44c116d55f59b6b4839747620e0c6cd299f8e9f8':
Fix root inode security labeling issue.
Colin Cross [Thu, 31 Jan 2013 02:03:01 +0000 (18:03 -0800)]
am
682a27cb: Merge "Fix root inode security labeling issue."
# By Robert Craig
# Via Gerrit Code Review (1) and Robert Craig (1)
* commit '
682a27cbce4935a6598c42a248855eb5878c1115':
Fix root inode security labeling issue.
Colin Cross [Thu, 31 Jan 2013 01:55:51 +0000 (01:55 +0000)]
Merge "Fix root inode security labeling issue."
Robert Craig [Wed, 30 Jan 2013 17:54:46 +0000 (12:54 -0500)]
Fix root inode security labeling issue.
Introducing the verbose flag accidentally wrapped the
security label function call for the root inode. The
system.img will not be correctly labeled without this change.
Change-Id: If73b63d4ee815bbf428dc3d72b9df000a2075a45
Signed-off-by: Robert Craig <rpcraig@tycho.ncsc.mil>
Colin Cross [Thu, 24 Jan 2013 05:21:17 +0000 (21:21 -0800)]
Merge commit '
4ea0ecda' into master
Colin Cross [Thu, 24 Jan 2013 05:21:05 +0000 (21:21 -0800)]
Merge commit '
30ea356e' into master
Colin Cross [Thu, 24 Jan 2013 05:20:39 +0000 (21:20 -0800)]
Merge commit '
ebe2ff59' into master
Colin Cross [Thu, 24 Jan 2013 02:42:52 +0000 (18:42 -0800)]
am
f52abf4c: Merge "Add verbose option to make_ext4 command"
# By William Roberts
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '
f52abf4ca2ce307e7d4056e02c9e22075ab65459':
Add verbose option to make_ext4 command
Colin Cross [Thu, 24 Jan 2013 02:42:51 +0000 (18:42 -0800)]
am
72acd484: Merge "ext4_utils: reduce exported apis"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '
72acd48419ab568647552fb0d7d6ed376f75d4da':
ext4_utils: reduce exported apis
Colin Cross [Thu, 24 Jan 2013 01:48:51 +0000 (01:48 +0000)]
Merge "Add verbose option to make_ext4 command"
Colin Cross [Thu, 24 Jan 2013 01:48:03 +0000 (01:48 +0000)]
Merge "ext4_utils: reduce exported apis"
Colin Cross [Thu, 24 Jan 2013 01:40:03 +0000 (17:40 -0800)]
am
b1a25925: Merge "ext4_utils: export make_ext4fs_sparse_fd"
# Via Colin Cross (1) and Gerrit Code Review (1)
* commit '
b1a25925b1f027a3e11d05bbe396da51cb39f5c4':
ext4_utils: export make_ext4fs_sparse_fd
William Roberts [Thu, 17 Jan 2013 21:24:27 +0000 (13:24 -0800)]
Add verbose option to make_ext4 command
Enabeling the -v switch will cuase the
make_ext4 command to output the selinux
labeling context for all files.
Change-Id: Ifae8a11eb2c3f4644873d9784affffafb27775bf
Colin Cross [Wed, 23 Jan 2013 23:38:57 +0000 (15:38 -0800)]
ext4_utils: reduce exported apis
Remove unnecessary functions from make_ext4fs.h so they are not
exposed to users of libext4_utils.
Requires fixing up some internal places that depended on the
definitions in the external make_ext4fs.h header.
Change-Id: Ied24e0efb648d4fd2ccdd1a5a1b685e9bde9cfd7
Colin Cross [Thu, 24 Jan 2013 00:54:54 +0000 (00:54 +0000)]
Merge "ext4_utils: export make_ext4fs_sparse_fd"
Colin Cross [Wed, 23 Jan 2013 23:25:29 +0000 (15:25 -0800)]
ext4_utils: export make_ext4fs_sparse_fd
Export a function to create a sparse image, writing the output to
an fd. Useful for utilities that need to format a partition.
Change-Id: I3737c65c69b7df0a0bd25885ee70aaadef8a4ad5
Elliott Hughes [Tue, 22 Jan 2013 16:04:59 +0000 (08:04 -0800)]
am
7558e4bc: am
00724b61: Merge "test_atomics is an ARM specific test"
* commit '
7558e4bc78ecd98534824adfa486720666304267':
test_atomics is an ARM specific test
Elliott Hughes [Tue, 22 Jan 2013 16:00:07 +0000 (08:00 -0800)]
am
00724b61: Merge "test_atomics is an ARM specific test"
* commit '
00724b61779e04ff586dad4c9634572712b8ef70':
test_atomics is an ARM specific test
Elliott Hughes [Tue, 22 Jan 2013 15:40:03 +0000 (15:40 +0000)]
Merge "test_atomics is an ARM specific test"
Ben Cheng [Wed, 16 Jan 2013 00:21:34 +0000 (16:21 -0800)]
Add a static variant for micro_bench.
So that it will be easier to test target-dependent bionic implementations
across devices.
Change-Id: Ie74dc37d5632b1a270f0d2e9013d504a810640e2
JP Abgrall [Fri, 11 Jan 2013 01:04:42 +0000 (17:04 -0800)]
su: support fine grained setting of gid and groups
To allow some tests to quickly check if some group membership handling
are correctly done, the tests need to run as a proc belonging to multiple
groups.
su would normally only allow setting uid=gid=something.
This changes adds setting the gid separately from the uid and setting the
groups:
su [uid[,gid[,group1]...]] [cmd]]
E.g.
su
su shell ls /data
su 1000,shell,net_bw_acct,net_bw_stats id
will return
uid=1000(system) gid=2000(shell) groups=3006(net_bw_stats),3007(net_bw_acct)
Change-Id: I713454bf14c3bc3ece93aec3729bda102542d1b1
Colin Cross [Fri, 28 Dec 2012 17:47:49 +0000 (09:47 -0800)]
am
7fb52e56: am
8c5e84dd: Merge "ext4_utils: fix windows build by avoiding asprintf"
* commit '
7fb52e56a67d42291fd3b9e72d18e581ff4ab080':
ext4_utils: fix windows build by avoiding asprintf
Colin Cross [Fri, 28 Dec 2012 17:46:59 +0000 (09:46 -0800)]
am
60a6ff79: am
c3b25b1b: Merge "ext4_utils: fix segfault on error opening output file"
* commit '
60a6ff79478f273b4f7eafbba6fc74eab0563f03':
ext4_utils: fix segfault on error opening output file
Colin Cross [Fri, 28 Dec 2012 17:46:59 +0000 (09:46 -0800)]
am
7dc17025: am
1d1a9011: Merge "ext4_utils: canonicalize slashes in paths"
* commit '
7dc1702586a5a4b20255b49b81e09cf926f8cd3b':
ext4_utils: canonicalize slashes in paths
Colin Cross [Fri, 21 Dec 2012 22:44:24 +0000 (14:44 -0800)]
am
8c5e84dd: Merge "ext4_utils: fix windows build by avoiding asprintf"
* commit '
8c5e84dd6b934d3efa8a16a1e4bddd5720172d05':
ext4_utils: fix windows build by avoiding asprintf
Colin Cross [Fri, 21 Dec 2012 21:40:58 +0000 (13:40 -0800)]
Merge "ext4_utils: fix windows build by avoiding asprintf"
Colin Cross [Fri, 21 Dec 2012 19:17:58 +0000 (11:17 -0800)]
ext4_utils: fix windows build by avoiding asprintf
asprintf is not available on windows. Since it is only being used outside
operations.
Change-Id: I79c3a3934f6de7a3cd3f17db5ae7731e9a68387c
Colin Cross [Fri, 21 Dec 2012 18:11:37 +0000 (10:11 -0800)]
am
c3b25b1b: Merge "ext4_utils: fix segfault on error opening output file"
* commit '
c3b25b1b83e7042ce2e223b689efdee0d72f6ad1':
ext4_utils: fix segfault on error opening output file
Colin Cross [Fri, 21 Dec 2012 18:11:36 +0000 (10:11 -0800)]
am
1d1a9011: Merge "ext4_utils: canonicalize slashes in paths"
* commit '
1d1a9011f03b5bebbda14768dd3672f1371ff7fb':
ext4_utils: canonicalize slashes in paths
Colin Cross [Thu, 20 Dec 2012 22:41:23 +0000 (14:41 -0800)]
Merge "ext4_utils: fix segfault on error opening output file"
Colin Cross [Thu, 20 Dec 2012 22:41:13 +0000 (14:41 -0800)]
Merge "ext4_utils: canonicalize slashes in paths"
Colin Cross [Thu, 20 Dec 2012 20:24:52 +0000 (12:24 -0800)]
ext4_utils: fix segfault on error opening output file
error_errno uses longjmp, but the jump target has not been set up
in make_ext4fs_main.c. Use perror instead.
Change-Id: Ic86eeb8af2315d1847d0a6d667e0b4e25eb9bdda
Colin Cross [Thu, 20 Dec 2012 09:00:33 +0000 (01:00 -0800)]
ext4_utils: canonicalize slashes in paths
Simplify handling of slashes between directories in paths by
forcing them to have leading and trailing slashes as appropriate
when passed in to make_ext4fs, and then keeping all directory
paths with a trailing slash.
As a side effect, using "/" as the mountpoint is now supported.
Change-Id: I73fe709c26003a20b0bdf6504db16cc9e39edf9b
Colin Cross [Wed, 19 Dec 2012 07:09:53 +0000 (23:09 -0800)]
am
c9c4c77f: resolved conflicts for merge of
917e120f to jb-mr1-dev-plus-aosp
* commit '
c9c4c77f368938af19270da5ce24d0b8a94ece77':
make_ext4fs: fix sepolicy lookup for lost+found
Colin Cross [Wed, 19 Dec 2012 06:50:50 +0000 (22:50 -0800)]
resolved conflicts for merge of
917e120f to jb-mr1-dev-plus-aosp
Change-Id: I5f3176d4f4859e7cf70899173f28944fc3a678b4
Colin Cross [Wed, 19 Dec 2012 00:16:38 +0000 (16:16 -0800)]
am
828b2ca0: resolved conflicts for merge of
f69ebaba to jb-mr1-dev-plus-aosp
* commit '
828b2ca0ae745ee0c061eaed581897dac8a6fe9c':
make_ext4fs: insert lost+found directory into filled filesystems
Colin Cross [Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)]
resolved conflicts for merge of
f69ebaba to jb-mr1-dev-plus-aosp
Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c
Colin Cross [Tue, 18 Dec 2012 23:27:26 +0000 (15:27 -0800)]
am
c04808a5: make_ext4fs: fix sepolicy lookup for lost+found
* commit '
c04808a532b0421fded05eecf5d843c45b7eb407':
make_ext4fs: fix sepolicy lookup for lost+found
Colin Cross [Tue, 18 Dec 2012 23:27:25 +0000 (15:27 -0800)]
am
0f92e16a: make_ext4fs: insert lost+found directory into filled filesystems
* commit '
0f92e16a064c285f5c667df7090b07d28e5e098a':
make_ext4fs: insert lost+found directory into filled filesystems
Chris Dearman [Tue, 18 Dec 2012 00:57:13 +0000 (16:57 -0800)]
test_atomics is an ARM specific test
Bionic only defines the __atomic_xxx functions for ARM legacy support.
Change-Id: I813cf9d66ccfc026f89cfbc0e5cbed202e263594
Signed-off-by: Chris Dearman <chris@mips.com>
Colin Cross [Tue, 27 Nov 2012 00:32:16 +0000 (16:32 -0800)]
make_ext4fs: fix sepolicy lookup for lost+found
selabel_lookup needs the full path including mountpoint.
Change-Id: Idc0641683a4e4528d94e54be1897315bf5fcdb0d
Colin Cross [Wed, 21 Nov 2012 03:41:42 +0000 (19:41 -0800)]
make_ext4fs: insert lost+found directory into filled filesystems
Insert a lost+found directory if necessary when creating a filesystem
based on a directory structure. This will make the resulting image
clean when tested with e2fsck, allowing e2fsck to be run on all images
as a validity test.
Change-Id: I81d0b6b4a802713270d3469e5a3bc555b680ec7e
The Android Open Source Project [Thu, 29 Nov 2012 23:12:37 +0000 (15:12 -0800)]
am
066c268b: (-s ours) am
da068042: Reconcile with jb-mr1-release - do not merge
* commit '
066c268bb596d7188091278e92638575765e6e98':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 23:12:37 +0000 (15:12 -0800)]
am
a3091bec: am
1275cfc5: am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
a3091bec956d102a4afa42be3a35a151d3065676':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Chad Jones [Thu, 29 Nov 2012 22:55:59 +0000 (14:55 -0800)]
atrace moved to cmds/atrace in platform/frameworks/native
The Android Open Source Project [Thu, 29 Nov 2012 22:28:20 +0000 (14:28 -0800)]
am
da068042: Reconcile with jb-mr1-release - do not merge
* commit '
da068042443cf968773bd9c7f2ca8e2ae8e59a05':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 22:28:00 +0000 (14:28 -0800)]
am
1275cfc5: am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
1275cfc50b86618f925856e9727956c7d5a02584':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 20:48:51 +0000 (12:48 -0800)]
am
d040d300: am
cb95c864: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
d040d300cbac8d6dd609531f88fcc2667ebee367':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 20:45:34 +0000 (12:45 -0800)]
am
cb95c864: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
cb95c864fe069eecb88807cbbb456baf9ee2c44d':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
The Android Open Source Project [Thu, 29 Nov 2012 19:54:58 +0000 (11:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6144d785b6b161bf3f84f94b5ae8a612eaf8ffca
Colin Cross [Thu, 29 Nov 2012 18:58:20 +0000 (10:58 -0800)]
am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
430b67d37c9f0a39bd06c128da96e37866d2ac36':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Tue, 20 Nov 2012 22:07:39 +0000 (14:07 -0800)]
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.
Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.
Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
Colin Cross [Tue, 20 Nov 2012 22:07:39 +0000 (14:07 -0800)]
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.
Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.
Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
Colin Cross [Tue, 20 Nov 2012 22:07:39 +0000 (14:07 -0800)]
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.
Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.
Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
Colin Cross [Tue, 27 Nov 2012 00:54:24 +0000 (16:54 -0800)]
am
0078f358: Merge "make_ext4fs: fix sepolicy lookup for lost+found"
* commit '
0078f358ee79245e87fa8f5fc32ce30887f08357':
make_ext4fs: fix sepolicy lookup for lost+found
Colin Cross [Tue, 27 Nov 2012 00:40:47 +0000 (16:40 -0800)]
Merge "make_ext4fs: fix sepolicy lookup for lost+found"
Colin Cross [Tue, 27 Nov 2012 00:32:16 +0000 (16:32 -0800)]
make_ext4fs: fix sepolicy lookup for lost+found
selabel_lookup needs the full path including mountpoint.
Change-Id: Idc0641683a4e4528d94e54be1897315bf5fcdb0d
Colin Cross [Mon, 26 Nov 2012 23:46:18 +0000 (15:46 -0800)]
am
aeb0b9fe: Merge "make_ext4fs: insert lost+found directory into filled filesystems"
* commit '
aeb0b9fe4a2b4ee62076ac5d608218f685e60837':
make_ext4fs: insert lost+found directory into filled filesystems
Colin Cross [Mon, 26 Nov 2012 23:28:55 +0000 (15:28 -0800)]
Merge "make_ext4fs: insert lost+found directory into filled filesystems"
Colin Cross [Wed, 21 Nov 2012 03:41:42 +0000 (19:41 -0800)]
make_ext4fs: insert lost+found directory into filled filesystems
Insert a lost+found directory if necessary when creating a filesystem
based on a directory structure. This will make the resulting image
clean when tested with e2fsck, allowing e2fsck to be run on all images
as a validity test.
Change-Id: I81d0b6b4a802713270d3469e5a3bc555b680ec7e
Colin Cross [Mon, 26 Nov 2012 21:29:51 +0000 (13:29 -0800)]
am
3861978e: Merge "make_ext4fs: fix dentry padding when dentry size is 4088 or 4092"
* commit '
3861978ea090352f80bc4b50cb1c2d0fa6dc08da':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Mon, 26 Nov 2012 21:01:12 +0000 (13:01 -0800)]
Merge "make_ext4fs: fix dentry padding when dentry size is 4088 or 4092"
Colin Cross [Tue, 20 Nov 2012 22:07:39 +0000 (14:07 -0800)]
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.
Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.
Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
Ying Wang [Tue, 20 Nov 2012 15:12:12 +0000 (07:12 -0800)]
am
1eda334e: Merge "Make SIZE a mandatory parameter."
* commit '
1eda334e947485b6b406a087167b9fb311933d32':
Make SIZE a mandatory parameter.
Ying Wang [Mon, 19 Nov 2012 23:43:46 +0000 (15:43 -0800)]
Merge "Make SIZE a mandatory parameter."
Ying Wang [Mon, 19 Nov 2012 18:42:55 +0000 (10:42 -0800)]
Make SIZE a mandatory parameter.
Commit
b4eca4b24af9c80ebb2a7fa2ba539a48096b7576 introduced a new
optional parameter FILE_CONTEXTS.
But the script can accept only 1 optional parameter as the last one.
Otherwise FILE_CONTEXTS may be taken as SIZE.
Change-Id: I1a701e191769f3936cfe6557ea3a20e1691dc859
Glenn Kasten [Thu, 15 Nov 2012 00:24:27 +0000 (16:24 -0800)]
Fix build
Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998
Erik Gilling [Wed, 14 Nov 2012 23:11:21 +0000 (15:11 -0800)]
add asynchronous tracing
Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d
Irfan Sheriff [Thu, 8 Nov 2012 14:22:06 +0000 (06:22 -0800)]
am
1df980dd: am
c3dc8929: Use updated stop supplicant API
* commit '
1df980dd3c6a7130540724e9f3f6121d677e4408':
Use updated stop supplicant API
Irfan Sheriff [Thu, 8 Nov 2012 14:14:30 +0000 (06:14 -0800)]
am
c3dc8929: Use updated stop supplicant API
* commit '
c3dc8929286e3f3b46d4d014c5b7aeecb416f4e0':
Use updated stop supplicant API
Irfan Sheriff [Mon, 5 Nov 2012 15:44:10 +0000 (07:44 -0800)]
Use updated stop supplicant API
Bug:
7227463
Change-Id: Ifecb256fed68c2046b77a5ce7a8c9f25c8e3fe62
The Android Open Source Project [Tue, 6 Nov 2012 20:34:12 +0000 (12:34 -0800)]
am
8be5ea33: (-s ours) am
07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
8be5ea335c6aacb2af1f3c77b19db9509f26e601':
The Android Open Source Project [Tue, 6 Nov 2012 20:30:11 +0000 (12:30 -0800)]
am
07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
07c8a6d238ddf855d5d6b4421d2527c580a374b6':
The Android Open Source Project [Tue, 6 Nov 2012 20:19:21 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d
The Android Open Source Project [Wed, 31 Oct 2012 16:28:08 +0000 (09:28 -0700)]
am
ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b':
The Android Open Source Project [Wed, 31 Oct 2012 16:19:01 +0000 (09:19 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I687546ca2bdfc152e141cda550975329f2bec732
The Android Automerger [Fri, 19 Oct 2012 22:46:35 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Erik Gilling [Fri, 19 Oct 2012 20:22:18 +0000 (13:22 -0700)]
am
9d547387: am
3f91534e: atrace: add sync trace support
* commit '
9d54738752df617af3bf281bc1969136fb08943d':
atrace: add sync trace support
Erik Gilling [Fri, 19 Oct 2012 19:18:45 +0000 (12:18 -0700)]
am
3f91534e: atrace: add sync trace support
* commit '
3f91534edf98d2a385c8fa29839cdd15a69f21d3':
atrace: add sync trace support
Kenny Root [Wed, 17 Oct 2012 20:02:01 +0000 (13:02 -0700)]
am
af41b37f: am
7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
* commit '
af41b37f0088417f98261c24647f195ecd4999fc':
Add automatic file_contexts handle to make_ext4fs.
Kenny Root [Wed, 17 Oct 2012 19:58:58 +0000 (12:58 -0700)]
am
7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
* commit '
7176b213480e87bc303073ccc553fdc824198355':
Add automatic file_contexts handle to make_ext4fs.