tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix preempt count underflow in nilfs_btnode_prepare_change_key

Linus Torvalds 5a09adf1 931f7035

+1 -1
unified split
+1 -1
fs/nilfs2/btnode.c
··· 209 * We cannot call radix_tree_preload for the kernels older 210 * than 2.6.23, because it is not exported for modules. 211 */ 212 err = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); 213 if (err) 214 goto failed_unlock; ··· 220 (unsigned long long)oldkey, 221 (unsigned long long)newkey); 222 223 - retry: 224 spin_lock_irq(&btnc->tree_lock); 225 err = radix_tree_insert(&btnc->page_tree, newkey, obh->b_page); 226 spin_unlock_irq(&btnc->tree_lock);
··· 209 * We cannot call radix_tree_preload for the kernels older 210 * than 2.6.23, because it is not exported for modules. 211 */ 212 + retry: 213 err = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM); 214 if (err) 215 goto failed_unlock; ··· 219 (unsigned long long)oldkey, 220 (unsigned long long)newkey); 221 222 spin_lock_irq(&btnc->tree_lock); 223 err = radix_tree_insert(&btnc->page_tree, newkey, obh->b_page); 224 spin_unlock_irq(&btnc->tree_lock);