[AF_RXRPC/AFS]: Arch-specific fixes.

Fixes for various arch compilation problems:

 (*) Missing module exports.

 (*) Variable name collision when rxkad and af_rxrpc both built in
     (rxrpc_debug).

 (*) Large constant representation problem (AFS_UUID_TO_UNIX_TIME).

 (*) Configuration dependencies.

 (*) printk() format warnings.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c
index 503dfe6d1450f5ce9ec360ae07ab2822f007e613..118daf5a0632cc505f2f88574ab645c4b79e14a5 100644 (file)
--- a/arch/ia64/lib/csum_partial_copy.c
+++ b/arch/ia64/lib/csum_partial_copy.c
@@ -128,6 +128,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
        return (__force __wsum)result;
 }
 
+EXPORT_SYMBOL(csum_partial_copy_from_user);
+
 __wsum
 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {

diff --git a/fs/Kconfig b/fs/Kconfig
index e33c089245721cd6d9e0dd797ec786187add7135..a42f767dcdd52f1867451927a5613490bbb2e5ed 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -2020,6 +2020,7 @@ config AFS_FS
        tristate "Andrew File System support (AFS) (EXPERIMENTAL)"
        depends on INET && EXPERIMENTAL
        select AF_RXRPC
+       select KEYS
        help
          If you say Y here, you will get an experimental Andrew File System
          driver. It currently only supports unsecured read-only AFS access.

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 6dd3197d1d8d55250adb3228e7de1b42dafbcf7c..34665f7d7a19360769daac981be9c2d042ce036e 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -367,7 +367,7 @@ struct afs_uuid {
        u32             time_low;                       /* low part of timestamp */
        u16             time_mid;                       /* mid part of timestamp */
        u16             time_hi_and_version;            /* high part of timestamp and version  */
-#define AFS_UUID_TO_UNIX_TIME  0x01b21dd213814000
+#define AFS_UUID_TO_UNIX_TIME  0x01b21dd213814000ULL
 #define AFS_UUID_TIMEHI_MASK   0x0fff
 #define AFS_UUID_VERSION_TIME  0x1000  /* time-based UUID */
 #define AFS_UUID_VERSION_NAME  0x3000  /* name-based UUID */

diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index e7b047328a39df53e6efb774f95baaddc9dcd14e..222c1a3abbb8fdbcf30a6c9fd48c25b0d34f1b25 100644 (file)
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -772,7 +772,7 @@ int afs_extract_data(struct afs_call *call, struct sk_buff *skb,
 
        if (call->offset < count) {
                if (last) {
-                       _leave(" = -EBADMSG [%d < %lu]", call->offset, count);
+                       _leave(" = -EBADMSG [%d < %zu]", call->offset, count);
                        return -EBADMSG;
                }
                _leave(" = -EAGAIN");

diff --git a/fs/afs/use-rtnetlink.c b/fs/afs/use-rtnetlink.c
index 82f0daa28970ea92d97e1041b4a34c5a86b79e3e..f8991c700e02be4764055357edcabef8c62b5fce 100644 (file)
--- a/fs/afs/use-rtnetlink.c
+++ b/fs/afs/use-rtnetlink.c
@@ -243,7 +243,7 @@ static int afs_read_rtm(struct afs_rtm_desc *desc)
                desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1,
                                               desc->datamax, 0);
                if (desc->datalen < 0) {
-                       _leave(" = %ld [recv]", desc->datalen);
+                       _leave(" = %zd [recv]", desc->datalen);
                        return desc->datalen;
                }
 

diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig
index d72380e304aee34f66fbeecb0e79255da91ceda4..8750f6da6bc7fb57e57e1b53f7f0bdd1fc4bfde1 100644 (file)
--- a/net/rxrpc/Kconfig
+++ b/net/rxrpc/Kconfig
@@ -30,6 +30,11 @@ config AF_RXRPC_DEBUG
 config RXKAD
        tristate "RxRPC Kerberos security"
        depends on AF_RXRPC && KEYS
+       select CRYPTO
+       select CRYPTO_MANAGER
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_PCBC
+       select CRYPTO_FCRYPT
        help
          Provide kerberos 4 and AFS kaserver security handling for AF_RXRPC
          through the use of the key retention service.

diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 1eaf529efac15e83cb935ce7ad18a5cacd207d17..5ec705144e10f7500b51755699afc97f3aa0e2a5 100644 (file)
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -18,6 +18,7 @@
 #include <linux/ctype.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
+#define rxrpc_debug rxkad_debug
 #include "ar-internal.h"
 
 #define RXKAD_VERSION                  2