]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
SUNRPC: use cmpxchg64() in gss_seq_send64_fetch_and_inc()
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2018 20:57:46 +0000 (22:57 +0200)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Fri, 5 Oct 2018 13:32:37 +0000 (09:32 -0400)
The newly introduced gss_seq_send64_fetch_and_inc() fails to build on
32-bit architectures:

net/sunrpc/auth_gss/gss_krb5_seal.c:144:14: note: in expansion of macro 'cmpxchg'
   seq_send = cmpxchg(&ctx->seq_send64, old, old + 1);
              ^~~~~~~
arch/x86/include/asm/cmpxchg.h:128:3: error: call to '__cmpxchg_wrong_size' declared with attribute error: Bad argument size for cmpxchg
   __cmpxchg_wrong_size();     \

As the message tells us, cmpxchg() cannot be used on 64-bit arguments,
that's what cmpxchg64() does.

Fixes: 571ed1fd2390 ("SUNRPC: Replace krb5_seq_lock with a lockless scheme")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
net/sunrpc/auth_gss/gss_krb5_seal.c

index 0ffb797b92e5678389e2e9d2076634e7dd967b8d..54e41c01edb7f119f2966c8d829165b9211ec87a 100644 (file)
@@ -141,7 +141,7 @@ gss_seq_send64_fetch_and_inc(struct krb5_ctx *ctx)
 
        do {
                old = seq_send;
-               seq_send = cmpxchg(&ctx->seq_send64, old, old + 1);
+               seq_send = cmpxchg64(&ctx->seq_send64, old, old + 1);
        } while (old != seq_send);
        return seq_send;
 }