From: Matthew Wilcox <willy@infradead.org>
Date: Tue, 5 Dec 2017 00:33:30 +0000 (-0500)
Subject: nilfs2: Use xa_erase_irq
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe2b51145c9ffd5a49013fe180e42e92ef0e6df9;p=linux.git

nilfs2: Use xa_erase_irq

This code simply opencoded xa_erase_irq().

Signed-off-by: Matthew Wilcox <willy@infradead.org>
---

diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
index de99db518571b..f2129a5d9f237 100644
--- a/fs/nilfs2/btnode.c
+++ b/fs/nilfs2/btnode.c
@@ -266,9 +266,7 @@ void nilfs_btnode_abort_change_key(struct address_space *btnc,
 		return;
 
 	if (nbh == NULL) {	/* blocksize == pagesize */
-		xa_lock_irq(&btnc->i_pages);
-		__xa_erase(&btnc->i_pages, newkey);
-		xa_unlock_irq(&btnc->i_pages);
+		xa_erase_irq(&btnc->i_pages, newkey);
 		unlock_page(ctxt->bh->b_page);
 	} else
 		brelse(nbh);