projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://1984.lsi.us.es/net
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
btrfs
/
locking.c
diff --git
a/fs/btrfs/locking.c
b/fs/btrfs/locking.c
index 5e178d8f7167f496e928613b6c1f0000c2ea242e..272f911203ffc61a66b3db9ffe8a9a3b9502ea24 100644
(file)
--- a/
fs/btrfs/locking.c
+++ b/
fs/btrfs/locking.c
@@
-208,7
+208,7
@@
void btrfs_tree_read_unlock_blocking(struct extent_buffer *eb)
* take a spinning write lock. This will wait for both
* blocking readers or writers
*/
* take a spinning write lock. This will wait for both
* blocking readers or writers
*/
-
int
btrfs_tree_lock(struct extent_buffer *eb)
+
void
btrfs_tree_lock(struct extent_buffer *eb)
{
again:
wait_event(eb->read_lock_wq, atomic_read(&eb->blocking_readers) == 0);
{
again:
wait_event(eb->read_lock_wq, atomic_read(&eb->blocking_readers) == 0);
@@
-230,13
+230,12
@@
again:
atomic_inc(&eb->spinning_writers);
atomic_inc(&eb->write_locks);
eb->lock_owner = current->pid;
atomic_inc(&eb->spinning_writers);
atomic_inc(&eb->write_locks);
eb->lock_owner = current->pid;
- return 0;
}
/*
* drop a spinning or a blocking write lock.
*/
}
/*
* drop a spinning or a blocking write lock.
*/
-
int
btrfs_tree_unlock(struct extent_buffer *eb)
+
void
btrfs_tree_unlock(struct extent_buffer *eb)
{
int blockers = atomic_read(&eb->blocking_writers);
{
int blockers = atomic_read(&eb->blocking_writers);
@@
-255,7
+254,6
@@
int btrfs_tree_unlock(struct extent_buffer *eb)
atomic_dec(&eb->spinning_writers);
write_unlock(&eb->lock);
}
atomic_dec(&eb->spinning_writers);
write_unlock(&eb->lock);
}
- return 0;
}
void btrfs_assert_tree_locked(struct extent_buffer *eb)
}
void btrfs_assert_tree_locked(struct extent_buffer *eb)