.. | .. |
---|
106 | 106 | "0x%llx.", (unsigned long long)bh->b_blocknr); |
---|
107 | 107 | } |
---|
108 | 108 | first = page_buffers(page); |
---|
109 | | - local_irq_save(flags); |
---|
110 | | - bit_spin_lock(BH_Uptodate_Lock, &first->b_state); |
---|
| 109 | + flags = bh_uptodate_lock_irqsave(first); |
---|
111 | 110 | clear_buffer_async_read(bh); |
---|
112 | 111 | unlock_buffer(bh); |
---|
113 | 112 | tmp = bh; |
---|
.. | .. |
---|
122 | 121 | } |
---|
123 | 122 | tmp = tmp->b_this_page; |
---|
124 | 123 | } while (tmp != bh); |
---|
125 | | - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state); |
---|
126 | | - local_irq_restore(flags); |
---|
| 124 | + bh_uptodate_unlock_irqrestore(first, flags); |
---|
127 | 125 | /* |
---|
128 | 126 | * If none of the buffers had errors then we can set the page uptodate, |
---|
129 | 127 | * but we first have to perform the post read mst fixups, if the |
---|
.. | .. |
---|
156 | 154 | unlock_page(page); |
---|
157 | 155 | return; |
---|
158 | 156 | still_busy: |
---|
159 | | - bit_spin_unlock(BH_Uptodate_Lock, &first->b_state); |
---|
160 | | - local_irq_restore(flags); |
---|
161 | | - return; |
---|
| 157 | + bh_uptodate_unlock_irqrestore(first, flags); |
---|
162 | 158 | } |
---|
163 | 159 | |
---|
164 | 160 | /** |
---|