diff options
Diffstat (limited to 'kernel/include/linux/buffer_head.h')
| -rw-r--r-- | kernel/include/linux/buffer_head.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/include/linux/buffer_head.h b/kernel/include/linux/buffer_head.h index 6d25afd8b..4a201008b 100644 --- a/kernel/include/linux/buffer_head.h +++ b/kernel/include/linux/buffer_head.h @@ -77,8 +77,7 @@ struct buffer_head { atomic_t b_count; /* users using this buffer_head */ #ifdef CONFIG_PREEMPT_RT_BASE spinlock_t b_uptodate_lock; -#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || \ - defined(CONFIG_JBD2) || defined(CONFIG_JBD2_MODULE) +#if IS_ENABLED(CONFIG_JBD2) spinlock_t b_state_lock; spinlock_t b_journal_head_lock; #endif @@ -113,8 +112,7 @@ static inline void buffer_head_init_locks(struct buffer_head *bh) { #ifdef CONFIG_PREEMPT_RT_BASE spin_lock_init(&bh->b_uptodate_lock); -#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || \ - defined(CONFIG_JBD2) || defined(CONFIG_JBD2_MODULE) +#if IS_ENABLED(CONFIG_JBD2) spin_lock_init(&bh->b_state_lock); spin_lock_init(&bh->b_journal_head_lock); #endif @@ -271,8 +269,6 @@ int cont_write_begin(struct file *, struct address_space *, loff_t, get_block_t *, loff_t *); int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); -int __block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, - get_block_t get_block); int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, get_block_t get_block); /* Convert errno to return value from ->page_mkwrite() call */ |