From 9de9040235fcc92c412523a7dd25e491c6e8f83e Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 30 May 2014 10:51:18 +0200 Subject: NFS: Use smp_mb__{before,after}_atomic() Commit febdbfe8a91c (arch: Prepare for smp_mb__{before,after}_atomic()) deprecated the smp_mb__{before,after}_{atomic,clear}_{dec,inc,bit}*() functions in favour of the unified smp_mb__{before,after}_atomic(). While at it, convert the smb_mb__before_atomic()/clear_bit() pattern to the more idiomatic clear_bit_unlock(). Signed-off-by: Thierry Reding --- fs/nfs/pagelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 35333196962..c00d4f1de8e 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -173,9 +173,8 @@ nfs_page_group_unlock(struct nfs_page *req) WARN_ON_ONCE(head != head->wb_head); - smp_mb__before_clear_bit(); - clear_bit(PG_HEADLOCK, &head->wb_flags); - smp_mb__after_clear_bit(); + clear_bit_unlock(PG_HEADLOCK, &head->wb_flags); + smp_mb__after_atomic(); wake_up_bit(&head->wb_flags, PG_HEADLOCK); } -- cgit v1.2.3