nfsd: don't open-code clear_and_wake_up_bit

[ Upstream commit b8bea9f6cdd7236c7c2238d022145e9b2f8aac22 ]

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 4a3796c6bd957350bd0ecaaa301bc22b7bd95cbe..677a8d935ccc2cb957c412c6034d41d6e6f6d0e7 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -1173,9 +1173,7 @@ open_file:
                status = nfserr_jukebox;
        if (status != nfs_ok)
                nfsd_file_unhash(nf);
-       clear_bit_unlock(NFSD_FILE_PENDING, &nf->nf_flags);
-       smp_mb__after_atomic();
-       wake_up_bit(&nf->nf_flags, NFSD_FILE_PENDING);
+       clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags);
        goto out;
 }