aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVictor Fusco <victor@cetuc.puc-rio.br>2005-07-08 17:57:47 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-08 17:57:47 -0400
commit86a76caf8705e3524e15f343f3c4806939a06dc8 (patch)
treeac2022a6073b5af228e009178048bdab070d2230 /include
parentb03efcfb2180289718991bb984044ce6c5b7d1b0 (diff)
[NET]: Fix sparse warnings
From: Victor Fusco <victor@cetuc.puc-rio.br> Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/skbuff.h29
-rw-r--r--include/net/sock.h18
-rw-r--r--include/net/tcp.h3
3 files changed, 31 insertions, 19 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 14b950413495..5d4a990d5577 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -300,20 +300,26 @@ struct sk_buff {
300#include <asm/system.h> 300#include <asm/system.h>
301 301
302extern void __kfree_skb(struct sk_buff *skb); 302extern void __kfree_skb(struct sk_buff *skb);
303extern struct sk_buff *alloc_skb(unsigned int size, int priority); 303extern struct sk_buff *alloc_skb(unsigned int size,
304 unsigned int __nocast priority);
304extern struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp, 305extern struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
305 unsigned int size, int priority); 306 unsigned int size,
307 unsigned int __nocast priority);
306extern void kfree_skbmem(struct sk_buff *skb); 308extern void kfree_skbmem(struct sk_buff *skb);
307extern struct sk_buff *skb_clone(struct sk_buff *skb, int priority); 309extern struct sk_buff *skb_clone(struct sk_buff *skb,
308extern struct sk_buff *skb_copy(const struct sk_buff *skb, int priority); 310 unsigned int __nocast priority);
309extern struct sk_buff *pskb_copy(struct sk_buff *skb, int gfp_mask); 311extern struct sk_buff *skb_copy(const struct sk_buff *skb,
312 unsigned int __nocast priority);
313extern struct sk_buff *pskb_copy(struct sk_buff *skb,
314 unsigned int __nocast gfp_mask);
310extern int pskb_expand_head(struct sk_buff *skb, 315extern int pskb_expand_head(struct sk_buff *skb,
311 int nhead, int ntail, int gfp_mask); 316 int nhead, int ntail,
317 unsigned int __nocast gfp_mask);
312extern struct sk_buff *skb_realloc_headroom(struct sk_buff *skb, 318extern struct sk_buff *skb_realloc_headroom(struct sk_buff *skb,
313 unsigned int headroom); 319 unsigned int headroom);
314extern struct sk_buff *skb_copy_expand(const struct sk_buff *skb, 320extern struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
315 int newheadroom, int newtailroom, 321 int newheadroom, int newtailroom,
316 int priority); 322 unsigned int __nocast priority);
317extern struct sk_buff * skb_pad(struct sk_buff *skb, int pad); 323extern struct sk_buff * skb_pad(struct sk_buff *skb, int pad);
318#define dev_kfree_skb(a) kfree_skb(a) 324#define dev_kfree_skb(a) kfree_skb(a)
319extern void skb_over_panic(struct sk_buff *skb, int len, 325extern void skb_over_panic(struct sk_buff *skb, int len,
@@ -464,7 +470,8 @@ static inline int skb_shared(const struct sk_buff *skb)
464 * 470 *
465 * NULL is returned on a memory allocation failure. 471 * NULL is returned on a memory allocation failure.
466 */ 472 */
467static inline struct sk_buff *skb_share_check(struct sk_buff *skb, int pri) 473static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
474 unsigned int __nocast pri)
468{ 475{
469 might_sleep_if(pri & __GFP_WAIT); 476 might_sleep_if(pri & __GFP_WAIT);
470 if (skb_shared(skb)) { 477 if (skb_shared(skb)) {
@@ -1001,7 +1008,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
1001 * %NULL is returned in there is no free memory. 1008 * %NULL is returned in there is no free memory.
1002 */ 1009 */
1003static inline struct sk_buff *__dev_alloc_skb(unsigned int length, 1010static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
1004 int gfp_mask) 1011 unsigned int __nocast gfp_mask)
1005{ 1012{
1006 struct sk_buff *skb = alloc_skb(length + 16, gfp_mask); 1013 struct sk_buff *skb = alloc_skb(length + 16, gfp_mask);
1007 if (likely(skb)) 1014 if (likely(skb))
@@ -1114,8 +1121,8 @@ static inline int skb_can_coalesce(struct sk_buff *skb, int i,
1114 * If there is no free memory -ENOMEM is returned, otherwise zero 1121 * If there is no free memory -ENOMEM is returned, otherwise zero
1115 * is returned and the old skb data released. 1122 * is returned and the old skb data released.
1116 */ 1123 */
1117extern int __skb_linearize(struct sk_buff *skb, int gfp); 1124extern int __skb_linearize(struct sk_buff *skb, unsigned int __nocast gfp);
1118static inline int skb_linearize(struct sk_buff *skb, int gfp) 1125static inline int skb_linearize(struct sk_buff *skb, unsigned int __nocast gfp)
1119{ 1126{
1120 return __skb_linearize(skb, gfp); 1127 return __skb_linearize(skb, gfp);
1121} 1128}
diff --git a/include/net/sock.h b/include/net/sock.h
index 7b76f891ae2d..a1042d08becd 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -684,16 +684,17 @@ extern void FASTCALL(release_sock(struct sock *sk));
684#define bh_lock_sock(__sk) spin_lock(&((__sk)->sk_lock.slock)) 684#define bh_lock_sock(__sk) spin_lock(&((__sk)->sk_lock.slock))
685#define bh_unlock_sock(__sk) spin_unlock(&((__sk)->sk_lock.slock)) 685#define bh_unlock_sock(__sk) spin_unlock(&((__sk)->sk_lock.slock))
686 686
687extern struct sock *sk_alloc(int family, int priority, 687extern struct sock *sk_alloc(int family,
688 unsigned int __nocast priority,
688 struct proto *prot, int zero_it); 689 struct proto *prot, int zero_it);
689extern void sk_free(struct sock *sk); 690extern void sk_free(struct sock *sk);
690 691
691extern struct sk_buff *sock_wmalloc(struct sock *sk, 692extern struct sk_buff *sock_wmalloc(struct sock *sk,
692 unsigned long size, int force, 693 unsigned long size, int force,
693 int priority); 694 unsigned int __nocast priority);
694extern struct sk_buff *sock_rmalloc(struct sock *sk, 695extern struct sk_buff *sock_rmalloc(struct sock *sk,
695 unsigned long size, int force, 696 unsigned long size, int force,
696 int priority); 697 unsigned int __nocast priority);
697extern void sock_wfree(struct sk_buff *skb); 698extern void sock_wfree(struct sk_buff *skb);
698extern void sock_rfree(struct sk_buff *skb); 699extern void sock_rfree(struct sk_buff *skb);
699 700
@@ -708,7 +709,8 @@ extern struct sk_buff *sock_alloc_send_skb(struct sock *sk,
708 unsigned long size, 709 unsigned long size,
709 int noblock, 710 int noblock,
710 int *errcode); 711 int *errcode);
711extern void *sock_kmalloc(struct sock *sk, int size, int priority); 712extern void *sock_kmalloc(struct sock *sk, int size,
713 unsigned int __nocast priority);
712extern void sock_kfree_s(struct sock *sk, void *mem, int size); 714extern void sock_kfree_s(struct sock *sk, void *mem, int size);
713extern void sk_send_sigurg(struct sock *sk); 715extern void sk_send_sigurg(struct sock *sk);
714 716
@@ -1132,7 +1134,8 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
1132} 1134}
1133 1135
1134static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk, 1136static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,
1135 int size, int mem, int gfp) 1137 int size, int mem,
1138 unsigned int __nocast gfp)
1136{ 1139{
1137 struct sk_buff *skb; 1140 struct sk_buff *skb;
1138 int hdr_len; 1141 int hdr_len;
@@ -1155,7 +1158,8 @@ static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk,
1155} 1158}
1156 1159
1157static inline struct sk_buff *sk_stream_alloc_skb(struct sock *sk, 1160static inline struct sk_buff *sk_stream_alloc_skb(struct sock *sk,
1158 int size, int gfp) 1161 int size,
1162 unsigned int __nocast gfp)
1159{ 1163{
1160 return sk_stream_alloc_pskb(sk, size, 0, gfp); 1164 return sk_stream_alloc_pskb(sk, size, 0, gfp);
1161} 1165}
@@ -1188,7 +1192,7 @@ static inline int sock_writeable(const struct sock *sk)
1188 return atomic_read(&sk->sk_wmem_alloc) < (sk->sk_sndbuf / 2); 1192 return atomic_read(&sk->sk_wmem_alloc) < (sk->sk_sndbuf / 2);
1189} 1193}
1190 1194
1191static inline int gfp_any(void) 1195static inline unsigned int __nocast gfp_any(void)
1192{ 1196{
1193 return in_softirq() ? GFP_ATOMIC : GFP_KERNEL; 1197 return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
1194} 1198}
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 4d5b12e4dc11..f4f9aba07ac2 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -860,7 +860,8 @@ extern void tcp_send_probe0(struct sock *);
860extern void tcp_send_partial(struct sock *); 860extern void tcp_send_partial(struct sock *);
861extern int tcp_write_wakeup(struct sock *); 861extern int tcp_write_wakeup(struct sock *);
862extern void tcp_send_fin(struct sock *sk); 862extern void tcp_send_fin(struct sock *sk);
863extern void tcp_send_active_reset(struct sock *sk, int priority); 863extern void tcp_send_active_reset(struct sock *sk,
864 unsigned int __nocast priority);
864extern int tcp_send_synack(struct sock *); 865extern int tcp_send_synack(struct sock *);
865extern void tcp_push_one(struct sock *, unsigned int mss_now); 866extern void tcp_push_one(struct sock *, unsigned int mss_now);
866extern void tcp_send_ack(struct sock *sk); 867extern void tcp_send_ack(struct sock *sk);
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-12 23:42:47 -0500
">; block = __adfs_block_map(inode->i_sb, inode->i_ino, block); if (block) map_bh(bh, inode->i_sb, block); return 0; } /* don't support allocation of blocks yet */ return -EIO; abort_toobig: return 0; } static int adfs_writepage(struct page *page, struct writeback_control *wbc) { return block_write_full_page(page, adfs_get_block, wbc); } static int adfs_readpage(struct file *file, struct page *page) { return block_read_full_page(page, adfs_get_block); } static void adfs_write_failed(struct address_space *mapping, loff_t to) { struct inode *inode = mapping->host; if (to > inode->i_size) truncate_pagecache(inode, inode->i_size); } static int adfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata) { int ret; *pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, adfs_get_block, &ADFS_I(mapping->host)->mmu_private); if (unlikely(ret)) adfs_write_failed(mapping, pos + len); return ret; } static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) { return generic_block_bmap(mapping, block, adfs_get_block); } static const struct address_space_operations adfs_aops = { .readpage = adfs_readpage, .writepage = adfs_writepage, .write_begin = adfs_write_begin, .write_end = generic_write_end, .bmap = _adfs_bmap }; /* * Convert ADFS attributes and filetype to Linux permission. */ static umode_t adfs_atts2mode(struct super_block *sb, struct inode *inode) { unsigned int attr = ADFS_I(inode)->attr; umode_t mode, rmask; struct adfs_sb_info *asb = ADFS_SB(sb); if (attr & ADFS_NDA_DIRECTORY) { mode = S_IRUGO & asb->s_owner_mask; return S_IFDIR | S_IXUGO | mode; } switch (adfs_filetype(ADFS_I(inode)->loadaddr)) { case 0xfc0: /* LinkFS */ return S_IFLNK|S_IRWXUGO; case 0xfe6: /* UnixExec */ rmask = S_IRUGO | S_IXUGO; break; default: rmask = S_IRUGO; } mode = S_IFREG; if (attr & ADFS_NDA_OWNER_READ) mode |= rmask & asb->s_owner_mask; if (attr & ADFS_NDA_OWNER_WRITE) mode |= S_IWUGO & asb->s_owner_mask; if (attr & ADFS_NDA_PUBLIC_READ) mode |= rmask & asb->s_other_mask; if (attr & ADFS_NDA_PUBLIC_WRITE) mode |= S_IWUGO & asb->s_other_mask; return mode; } /* * Convert Linux permission to ADFS attribute. We try to do the reverse * of atts2mode, but there is not a 1:1 translation. */ static int adfs_mode2atts(struct super_block *sb, struct inode *inode) { umode_t mode; int attr; struct adfs_sb_info *asb = ADFS_SB(sb); /* FIXME: should we be able to alter a link? */ if (S_ISLNK(inode->i_mode)) return ADFS_I(inode)->attr; if (S_ISDIR(inode->i_mode)) attr = ADFS_NDA_DIRECTORY; else attr = 0; mode = inode->i_mode & asb->s_owner_mask; if (mode & S_IRUGO) attr |= ADFS_NDA_OWNER_READ; if (mode & S_IWUGO) attr |= ADFS_NDA_OWNER_WRITE; mode = inode->i_mode & asb->s_other_mask; mode &= ~asb->s_owner_mask; if (mode & S_IRUGO) attr |= ADFS_NDA_PUBLIC_READ; if (mode & S_IWUGO) attr |= ADFS_NDA_PUBLIC_WRITE; return attr; } /* * Convert an ADFS time to Unix time. ADFS has a 40-bit centi-second time * referenced to 1 Jan 1900 (til 2248) so we need to discard 2208988800 seconds * of time to convert from RISC OS epoch to Unix epoch. */ static void adfs_adfs2unix_time(struct timespec64 *tv, struct inode *inode) { unsigned int high, low; /* 01 Jan 1970 00:00:00 (Unix epoch) as nanoseconds since * 01 Jan 1900 00:00:00 (RISC OS epoch) */ static const s64 nsec_unix_epoch_diff_risc_os_epoch = 2208988800000000000LL; s64 nsec; if (!adfs_inode_is_stamped(inode)) goto cur_time; high = ADFS_I(inode)->loadaddr & 0xFF; /* top 8 bits of timestamp */ low = ADFS_I(inode)->execaddr; /* bottom 32 bits of timestamp */ /* convert 40-bit centi-seconds to 32-bit seconds * going via nanoseconds to retain precision */ nsec = (((s64) high << 32) | (s64) low) * 10000000; /* cs to ns */ /* Files dated pre 01 Jan 1970 00:00:00. */ if (nsec < nsec_unix_epoch_diff_risc_os_epoch) goto too_early; /* convert from RISC OS to Unix epoch */ nsec -= nsec_unix_epoch_diff_risc_os_epoch; *tv = ns_to_timespec64(nsec); return; cur_time: *tv = current_time(inode); return; too_early: tv->tv_sec = tv->tv_nsec = 0; return; } /* * Convert an Unix time to ADFS time. We only do this if the entry has a * time/date stamp already. */ static void adfs_unix2adfs_time(struct inode *inode, unsigned int secs) { unsigned int high, low; if (adfs_inode_is_stamped(inode)) { /* convert 32-bit seconds to 40-bit centi-seconds */ low = (secs & 255) * 100; high = (secs / 256) * 100 + (low >> 8) + 0x336e996a; ADFS_I(inode)->loadaddr = (high >> 24) | (ADFS_I(inode)->loadaddr & ~0xff); ADFS_I(inode)->execaddr = (low & 255) | (high << 8); } } /* * Fill in the inode information from the object information. * * Note that this is an inode-less filesystem, so we can't use the inode * number to reference the metadata on the media. Instead, we use the * inode number to hold the object ID, which in turn will tell us where * the data is held. We also save the parent object ID, and with these * two, we can locate the metadata. * * This does mean that we rely on an objects parent remaining the same at * all times - we cannot cope with a cross-directory rename (yet). */ struct inode * adfs_iget(struct super_block *sb, struct object_info *obj) { struct inode *inode; inode = new_inode(sb); if (!inode) goto out; inode->i_uid = ADFS_SB(sb)->s_uid; inode->i_gid = ADFS_SB(sb)->s_gid; inode->i_ino = obj->indaddr; inode->i_size = obj->size; set_nlink(inode, 2); inode->i_blocks = (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits; /* * we need to save the parent directory ID so that * write_inode can update the directory information * for this file. This will need special handling * for cross-directory renames. */ ADFS_I(inode)->parent_id = obj->parent_id; ADFS_I(inode)->loadaddr = obj->loadaddr; ADFS_I(inode)->execaddr = obj->execaddr; ADFS_I(inode)->attr = obj->attr; inode->i_mode = adfs_atts2mode(sb, inode); adfs_adfs2unix_time(&inode->i_mtime, inode); inode->i_atime = inode->i_mtime; inode->i_ctime = inode->i_mtime; if (S_ISDIR(inode->i_mode)) { inode->i_op = &adfs_dir_inode_operations; inode->i_fop = &adfs_dir_operations; } else if (S_ISREG(inode->i_mode)) { inode->i_op = &adfs_file_inode_operations; inode->i_fop = &adfs_file_operations; inode->i_mapping->a_ops = &adfs_aops; ADFS_I(inode)->mmu_private = inode->i_size; } inode_fake_hash(inode); out: return inode; } /* * Validate and convert a changed access mode/time to their ADFS equivalents. * adfs_write_inode will actually write the information back to the directory * later. */ int adfs_notify_change(struct dentry *dentry, struct iattr *attr) { struct inode *inode = d_inode(dentry); struct super_block *sb = inode->i_sb; unsigned int ia_valid = attr->ia_valid; int error; error = setattr_prepare(dentry, attr); /* * we can't change the UID or GID of any file - * we have a global UID/GID in the superblock */ if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, ADFS_SB(sb)->s_uid)) || (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, ADFS_SB(sb)->s_gid))) error = -EPERM; if (error) goto out; /* XXX: this is missing some actual on-disk truncation.. */ if (ia_valid & ATTR_SIZE) truncate_setsize(inode, attr->ia_size); if (ia_valid & ATTR_MTIME) { inode->i_mtime = attr->ia_mtime; adfs_unix2adfs_time(inode, attr->ia_mtime.tv_sec); } /* * FIXME: should we make these == to i_mtime since we don't * have the ability to represent them in our filesystem? */ if (ia_valid & ATTR_ATIME) inode->i_atime = attr->ia_atime; if (ia_valid & ATTR_CTIME) inode->i_ctime = attr->ia_ctime; if (ia_valid & ATTR_MODE) { ADFS_I(inode)->attr = adfs_mode2atts(sb, inode); inode->i_mode = adfs_atts2mode(sb, inode); } /* * FIXME: should we be marking this inode dirty even if * we don't have any metadata to write back? */ if (ia_valid & (ATTR_SIZE | ATTR_MTIME | ATTR_MODE)) mark_inode_dirty(inode); out: return error; } /* * write an existing inode back to the directory, and therefore the disk. * The adfs-specific inode data has already been updated by * adfs_notify_change() */ int adfs_write_inode(struct inode *inode, struct writeback_control *wbc) { struct super_block *sb = inode->i_sb; struct object_info obj; int ret; obj.indaddr = inode->i_ino; obj.name_len = 0; obj.parent_id = ADFS_I(inode)->parent_id; obj.loadaddr = ADFS_I(inode)->loadaddr; obj.execaddr = ADFS_I(inode)->execaddr; obj.attr = ADFS_I(inode)->attr; obj.size = inode->i_size; ret = adfs_dir_update(sb, &obj, wbc->sync_mode == WB_SYNC_ALL); return ret; }
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-12 23:42:47 -0500