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 'for-chris' of git://github.com/sensille/linux into integration
[pandora-kernel.git]
/
fs
/
btrfs
/
disk-io.h
diff --git
a/fs/btrfs/disk-io.h
b/fs/btrfs/disk-io.h
index
b3bdb5c
..
c99d0a8
100644
(file)
--- a/
fs/btrfs/disk-io.h
+++ b/
fs/btrfs/disk-io.h
@@
-85,8
+85,6
@@
int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info);
int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
struct btrfs_root *root);
-int btree_lock_page_hook(struct page *page);
-
#ifdef CONFIG_DEBUG_LOCK_ALLOC
void btrfs_init_lockdep(void);