diff options
author | David Howells <dhowells@redhat.com> | 2007-04-27 18:28:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-04-27 18:28:45 -0400 |
commit | b1bdb691c3c38b4fbaf99fa8474f5cfa99b2d774 (patch) | |
tree | aab0b09167997e5d5269bd5465bf99a41333e68b /fs/afs | |
parent | 47051a2152f8b2355ee70249a0faaf7b682e8ce5 (diff) |
[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>
Diffstat (limited to 'fs/afs')
-rw-r--r-- | fs/afs/internal.h | 2 | ||||
-rw-r--r-- | fs/afs/rxrpc.c | 2 | ||||
-rw-r--r-- | fs/afs/use-rtnetlink.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 6dd3197d1d8d..34665f7d7a19 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h | |||
@@ -367,7 +367,7 @@ struct afs_uuid { | |||
367 | u32 time_low; /* low part of timestamp */ | 367 | u32 time_low; /* low part of timestamp */ |
368 | u16 time_mid; /* mid part of timestamp */ | 368 | u16 time_mid; /* mid part of timestamp */ |
369 | u16 time_hi_and_version; /* high part of timestamp and version */ | 369 | u16 time_hi_and_version; /* high part of timestamp and version */ |
370 | #define AFS_UUID_TO_UNIX_TIME 0x01b21dd213814000 | 370 | #define AFS_UUID_TO_UNIX_TIME 0x01b21dd213814000ULL |
371 | #define AFS_UUID_TIMEHI_MASK 0x0fff | 371 | #define AFS_UUID_TIMEHI_MASK 0x0fff |
372 | #define AFS_UUID_VERSION_TIME 0x1000 /* time-based UUID */ | 372 | #define AFS_UUID_VERSION_TIME 0x1000 /* time-based UUID */ |
373 | #define AFS_UUID_VERSION_NAME 0x3000 /* name-based UUID */ | 373 | #define AFS_UUID_VERSION_NAME 0x3000 /* name-based UUID */ |
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index e7b047328a39..222c1a3abbb8 100644 --- 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, | |||
772 | 772 | ||
773 | if (call->offset < count) { | 773 | if (call->offset < count) { |
774 | if (last) { | 774 | if (last) { |
775 | _leave(" = -EBADMSG [%d < %lu]", call->offset, count); | 775 | _leave(" = -EBADMSG [%d < %zu]", call->offset, count); |
776 | return -EBADMSG; | 776 | return -EBADMSG; |
777 | } | 777 | } |
778 | _leave(" = -EAGAIN"); | 778 | _leave(" = -EAGAIN"); |
diff --git a/fs/afs/use-rtnetlink.c b/fs/afs/use-rtnetlink.c index 82f0daa28970..f8991c700e02 100644 --- 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) | |||
243 | desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1, | 243 | desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1, |
244 | desc->datamax, 0); | 244 | desc->datamax, 0); |
245 | if (desc->datalen < 0) { | 245 | if (desc->datalen < 0) { |
246 | _leave(" = %ld [recv]", desc->datalen); | 246 | _leave(" = %zd [recv]", desc->datalen); |
247 | return desc->datalen; | 247 | return desc->datalen; |
248 | } | 248 | } |
249 | 249 | ||