diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-07-27 22:13:10 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-07-27 22:18:13 +0200 |
| commit | ff95acb6733d41a8d45feb0e18b96df25e610e78 (patch) | |
| tree | e20983c579c9095970aefa9cb176a9df0654d1e4 /fs/btrfs/disk-io.h | |
| parent | Linux 3.0 (diff) | |
| parent | Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errors (diff) | |
| download | linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.tar.xz linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.zip | |
Merge branch 'integration' into for-linus
Diffstat (limited to 'fs/btrfs/disk-io.h')
| -rw-r--r-- | fs/btrfs/disk-io.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index a0b610a67aae..bec3ea4bd67f 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -87,10 +87,14 @@ int btree_lock_page_hook(struct page *page); #ifdef CONFIG_DEBUG_LOCK_ALLOC -void btrfs_set_buffer_lockdep_class(struct extent_buffer *eb, int level); +void btrfs_init_lockdep(void); +void btrfs_set_buffer_lockdep_class(u64 objectid, + struct extent_buffer *eb, int level); #else -static inline void btrfs_set_buffer_lockdep_class(struct extent_buffer *eb, - int level) +static inline void btrfs_init_lockdep(void) +{ } +static inline void btrfs_set_buffer_lockdep_class(u64 objectid, + struct extent_buffer *eb, int level) { } #endif |