vold: acquire wakelock on fstrim thread

If fstrim thread creation or detachment is failed, wakelock can be leaked.
So move wakelock acquire to do_fstrim_filesystems function

Change-Id: I4da3164343af83fae3e5b01700f43d1752661276
Signed-off-by: Young-ho Cha <ganadist@gmail.com>
This commit is contained in:
Young-ho Cha 2014-06-20 19:48:36 +09:00 committed by JP Abgrall
parent d55d8dac45
commit e72cd592b3

View file

@ -68,6 +68,11 @@ static void *do_fstrim_filesystems(void *thread_arg)
SLOGI("Starting fstrim work...\n");
/* Get a wakelock as this may take a while, and we don't want the
* device to sleep on us.
*/
acquire_wake_lock(PARTIAL_WAKE_LOCK, FSTRIM_WAKELOCK);
/* Log the start time in the event log */
LOG_EVENT_LONG(LOG_FSTRIM_START, get_boot_time_ms());
@ -133,11 +138,6 @@ int fstrim_filesystems(int deep_trim)
pthread_t t;
int ret;
/* Get a wakelock as this may take a while, and we don't want the
* device to sleep on us.
*/
acquire_wake_lock(PARTIAL_WAKE_LOCK, FSTRIM_WAKELOCK);
/* Depending on the emmc chip and size, this can take upwards
* of a few minutes. If done in the same thread as the caller
* of this function, that would block vold from accepting any