Nothing fails there. Mop up the leftovers of the early version of this, which did an allocation. While at it clean up the stubs and the #ifdef comments to make the header file readable.
Showing the changes to kernel (2 of 3 files). Show all
Unified · Split
| @@ -1101,6 +1101,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, · 1100 unmodified lines | ||
| 1101 | 1101 | #endif |
| 1102 | 1102 | mm_init_uprobes_state(mm); |
| 1103 | 1103 | hugetlb_count_init(mm); |
| 1104 | + futex_mm_init(mm); | |
| 1104 | 1105 | |
| 1105 | 1106 | mm_flags_clear_all(mm); |
| 1106 | 1107 | if (current->mm) { |
| @@ -1113,11 +1114,8 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, · 6 unmodified lines | ||
| 1113 | 1114 | mm->def_flags = 0; |
| 1114 | 1115 | } |
| 1115 | 1116 | |
| 1116 | − if (futex_mm_init(mm)) | |
| 1117 | − goto fail_mm_init; | |
| 1118 | − | |
| 1119 | 1117 | if (mm_alloc_pgd(mm)) |
| 1120 | − goto fail_nopgd; | |
| 1118 | + goto fail_mm_init; | |
| 1121 | 1119 | |
| 1122 | 1120 | if (mm_alloc_id(mm)) |
| 1123 | 1121 | goto fail_noid; |
| @@ -1144,8 +1142,6 @@ fail_nocontext: · 20 unmodified lines | ||
| 1144 | 1142 | mm_free_id(mm); |
| 1145 | 1143 | fail_noid: |
| 1146 | 1144 | mm_free_pgd(mm); |
| 1147 | −fail_nopgd: | |
| 1148 | − futex_hash_free(mm); | |
| 1149 | 1145 | fail_mm_init: |
| 1150 | 1146 | free_mm(mm); |
| 1151 | 1147 | return NULL; |
| @@ -1720,7 +1720,7 @@ static bool futex_ref_is_dead(struct futex_private_hash *fph) · 1719 unmodified lines | ||
| 1720 | 1720 | return atomic_long_read(&mm->futex_atomic) == 0; |
| 1721 | 1721 | } |
| 1722 | 1722 | |
| 1723 | −int futex_mm_init(struct mm_struct *mm) | |
| 1723 | +void futex_mm_init(struct mm_struct *mm) | |
| 1724 | 1724 | { |
| 1725 | 1725 | mutex_init(&mm->futex_hash_lock); |
| 1726 | 1726 | RCU_INIT_POINTER(mm->futex_phash, NULL); |
| @@ -1729,7 +1729,6 @@ int futex_mm_init(struct mm_struct *mm) · 2 unmodified lines | ||
| 1729 | 1729 | mm->futex_ref = NULL; |
| 1730 | 1730 | atomic_long_set(&mm->futex_atomic, 0); |
| 1731 | 1731 | mm->futex_batches = get_state_synchronize_rcu(); |
| 1732 | − return 0; | |
| 1733 | 1732 | } |
| 1734 | 1733 | |
| 1735 | 1734 | void futex_hash_free(struct mm_struct *mm) |