diff --git a/[refs] b/[refs] index 44bb2eba823c..e9183289bdbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abc0b50b6b9a9de8ae210f059598265a5438f2c4 +refs/heads/master: 6b81e14e645016597c81e71cd27ee5c57c3a3c36 diff --git a/trunk/fs/nilfs2/segment.c b/trunk/fs/nilfs2/segment.c index 172ad4257494..d926af626177 100644 --- a/trunk/fs/nilfs2/segment.c +++ b/trunk/fs/nilfs2/segment.c @@ -2674,6 +2674,8 @@ static int nilfs_segctor_start_thread(struct nilfs_sc_info *sci) } static void nilfs_segctor_kill_thread(struct nilfs_sc_info *sci) + __acquires(&sci->sc_state_lock) + __releases(&sci->sc_state_lock) { sci->sc_state |= NILFS_SEGCTOR_QUIT;