git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
md
/
bitmap.c
diff --git
a/drivers/md/bitmap.c
b/drivers/md/bitmap.c
index
3319c2f
..
6986b00
100644
(file)
--- a/
drivers/md/bitmap.c
+++ b/
drivers/md/bitmap.c
@@
-108,6
+108,8
@@
static void bitmap_free_page(struct bitmap *bitmap, unsigned char *page)
* allocated while we're using it
*/
static int bitmap_checkpage(struct bitmap *bitmap, unsigned long page, int create)
* allocated while we're using it
*/
static int bitmap_checkpage(struct bitmap *bitmap, unsigned long page, int create)
+__releases(bitmap->lock)
+__acquires(bitmap->lock)
{
unsigned char *mappage;
{
unsigned char *mappage;
@@
-325,7
+327,6
@@
static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
return 0;
bad_alignment:
return 0;
bad_alignment:
- rcu_read_unlock();
return -EINVAL;
}
return -EINVAL;
}
@@
-1207,6
+1208,8
@@
void bitmap_daemon_work(struct bitmap *bitmap)
static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,
sector_t offset, int *blocks,
int create)
static bitmap_counter_t *bitmap_get_counter(struct bitmap *bitmap,
sector_t offset, int *blocks,
int create)
+__releases(bitmap->lock)
+__acquires(bitmap->lock)
{
/* If 'create', we might release the lock and reclaim it.
* The lock must have been taken with interrupts enabled.
{
/* If 'create', we might release the lock and reclaim it.
* The lock must have been taken with interrupts enabled.