Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AF_RXRPC/AFS]: Arch-specific fixes.

Browse Source 
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>
This commit is contained in:
David Howells 2007-04-27 15:28:45 -07:00 committed by David S. Miller
parent 47051a2152
commit b1bdb691c3
7 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/lib/csum_partial_copy.c
View File

@ -128,6 +128,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
return (__force __wsum)result; return (__force __wsum)result;
} }
EXPORT_SYMBOL(csum_partial_copy_from_user);
__wsum __wsum
csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
{ {

1
fs/Kconfig
View File

@ -2020,6 +2020,7 @@ config AFS_FS
tristate "Andrew File System support (AFS) (EXPERIMENTAL)" tristate "Andrew File System support (AFS) (EXPERIMENTAL)"
depends on INET && EXPERIMENTAL depends on INET && EXPERIMENTAL
select AF_RXRPC select AF_RXRPC
select KEYS
help help
If you say Y here, you will get an experimental Andrew File System If you say Y here, you will get an experimental Andrew File System
driver. It currently only supports unsecured read-only AFS access. driver. It currently only supports unsecured read-only AFS access.

2
fs/afs/internal.h
View File

@ -367,7 +367,7 @@ struct afs_uuid {
u32 time_low; /* low part of timestamp */ u32 time_low; /* low part of timestamp */
u16 time_mid; /* mid part of timestamp */ u16 time_mid; /* mid part of timestamp */
u16 time_hi_and_version; /* high part of timestamp and version */ 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_TIMEHI_MASK 0x0fff
#define AFS_UUID_VERSION_TIME 0x1000 /* time-based UUID */ #define AFS_UUID_VERSION_TIME 0x1000 /* time-based UUID */
#define AFS_UUID_VERSION_NAME 0x3000 /* name-based UUID */ #define AFS_UUID_VERSION_NAME 0x3000 /* name-based UUID */

2
fs/afs/rxrpc.c
View File

@ -772,7 +772,7 @@ int afs_extract_data(struct afs_call *call, struct sk_buff *skb,
if (call->offset < count) { if (call->offset < count) {
if (last) { if (last) {
_leave(" = -EBADMSG [%d < %lu]", call->offset, count); _leave(" = -EBADMSG [%d < %zu]", call->offset, count);
return -EBADMSG; return -EBADMSG;
} }
_leave(" = -EAGAIN"); _leave(" = -EAGAIN");

2
fs/afs/use-rtnetlink.c
View File

@ -243,7 +243,7 @@ static int afs_read_rtm(struct afs_rtm_desc *desc)
desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1, desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1,
desc->datamax, 0); desc->datamax, 0);
if (desc->datalen < 0) { if (desc->datalen < 0) {
_leave(" = %ld [recv]", desc->datalen); _leave(" = %zd [recv]", desc->datalen);
return desc->datalen; return desc->datalen;
} }

5
net/rxrpc/Kconfig
View File

@ -30,6 +30,11 @@ config AF_RXRPC_DEBUG
config RXKAD config RXKAD
tristate "RxRPC Kerberos security" tristate "RxRPC Kerberos security"
depends on AF_RXRPC && KEYS depends on AF_RXRPC && KEYS
select CRYPTO
select CRYPTO_MANAGER
select CRYPTO_BLKCIPHER
select CRYPTO_PCBC
select CRYPTO_FCRYPT
help help
Provide kerberos 4 and AFS kaserver security handling for AF_RXRPC Provide kerberos 4 and AFS kaserver security handling for AF_RXRPC
through the use of the key retention service. through the use of the key retention service.

1
net/rxrpc/rxkad.c
View File

@ -18,6 +18,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/af_rxrpc.h> #include <net/af_rxrpc.h>
#define rxrpc_debug rxkad_debug
#include "ar-internal.h" #include "ar-internal.h"
#define RXKAD_VERSION 2 #define RXKAD_VERSION 2