[PATCH] freevxfs: minor cleanups

This patch addresses the following minor issues:

- Typo in printk
- Redundant casts
- Use C99 struct initializers instead of memset
- Parenthesis around return value
- Use inline instead of __inline__

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Pekka Enberg and committed by Linus Torvalds 8cb681b9 1d2cc3b8

+13 -14
+1 -1
fs/freevxfs/vxfs_bmap.c
··· 101 return 0; 102 103 fail_size: 104 - printk("vxfs: indirect extent to big!\n"); 105 fail_buf: 106 return 0; 107 }
··· 101 return 0; 102 103 fail_size: 104 + printk("vxfs: indirect extent too big!\n"); 105 fail_buf: 106 return 0; 107 }
+4 -4
fs/freevxfs/vxfs_lookup.c
··· 61 }; 62 63 64 - static __inline__ u_long 65 dir_pages(struct inode *inode) 66 { 67 return (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 68 } 69 70 - static __inline__ u_long 71 dir_blocks(struct inode *ip) 72 { 73 u_long bsize = ip->i_sb->s_blocksize; ··· 79 * 80 * len <= VXFS_NAMELEN and de != NULL are guaranteed by caller. 81 */ 82 - static __inline__ int 83 vxfs_match(int len, const char * const name, struct vxfs_direct *de) 84 { 85 if (len != de->d_namelen) ··· 89 return !memcmp(name, de->d_name, len); 90 } 91 92 - static __inline__ struct vxfs_direct * 93 vxfs_next_entry(struct vxfs_direct *de) 94 { 95 return ((struct vxfs_direct *)((char*)de + de->d_reclen));
··· 61 }; 62 63 64 + static inline u_long 65 dir_pages(struct inode *inode) 66 { 67 return (inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 68 } 69 70 + static inline u_long 71 dir_blocks(struct inode *ip) 72 { 73 u_long bsize = ip->i_sb->s_blocksize; ··· 79 * 80 * len <= VXFS_NAMELEN and de != NULL are guaranteed by caller. 81 */ 82 + static inline int 83 vxfs_match(int len, const char * const name, struct vxfs_direct *de) 84 { 85 if (len != de->d_namelen) ··· 89 return !memcmp(name, de->d_name, len); 90 } 91 92 + static inline struct vxfs_direct * 93 vxfs_next_entry(struct vxfs_direct *de) 94 { 95 return ((struct vxfs_direct *)((char*)de + de->d_reclen));
+5 -5
fs/freevxfs/vxfs_olt.c
··· 38 #include "vxfs_olt.h" 39 40 41 - static __inline__ void 42 vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp) 43 { 44 if (infp->vsi_fshino) ··· 46 infp->vsi_fshino = fshp->olt_fsino[0]; 47 } 48 49 - static __inline__ void 50 vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp) 51 { 52 if (infp->vsi_iext) ··· 54 infp->vsi_iext = ilistp->olt_iext[0]; 55 } 56 57 - static __inline__ u_long 58 vxfs_oblock(struct super_block *sbp, daddr_t block, u_long bsize) 59 { 60 if (sbp->s_blocksize % bsize) ··· 104 goto fail; 105 } 106 107 - oaddr = (char *)bp->b_data + op->olt_size; 108 - eaddr = (char *)bp->b_data + (infp->vsi_oltsize * sbp->s_blocksize); 109 110 while (oaddr < eaddr) { 111 struct vxfs_oltcommon *ocp =
··· 38 #include "vxfs_olt.h" 39 40 41 + static inline void 42 vxfs_get_fshead(struct vxfs_oltfshead *fshp, struct vxfs_sb_info *infp) 43 { 44 if (infp->vsi_fshino) ··· 46 infp->vsi_fshino = fshp->olt_fsino[0]; 47 } 48 49 + static inline void 50 vxfs_get_ilist(struct vxfs_oltilist *ilistp, struct vxfs_sb_info *infp) 51 { 52 if (infp->vsi_iext) ··· 54 infp->vsi_iext = ilistp->olt_iext[0]; 55 } 56 57 + static inline u_long 58 vxfs_oblock(struct super_block *sbp, daddr_t block, u_long bsize) 59 { 60 if (sbp->s_blocksize % bsize) ··· 104 goto fail; 105 } 106 107 + oaddr = bp->b_data + op->olt_size; 108 + eaddr = bp->b_data + (infp->vsi_oltsize * sbp->s_blocksize); 109 110 while (oaddr < eaddr) { 111 struct vxfs_oltcommon *ocp =
+3 -4
fs/freevxfs/vxfs_super.c
··· 155 156 sbp->s_flags |= MS_RDONLY; 157 158 - infp = kmalloc(sizeof(*infp), GFP_KERNEL); 159 if (!infp) { 160 printk(KERN_WARNING "vxfs: unable to allocate incore superblock\n"); 161 return -ENOMEM; 162 } 163 - memset(infp, 0, sizeof(*infp)); 164 165 bsize = sb_min_blocksize(sbp, BLOCK_SIZE); 166 if (!bsize) { ··· 195 #endif 196 197 sbp->s_magic = rsbp->vs_magic; 198 - sbp->s_fs_info = (void *)infp; 199 200 infp->vsi_raw = rsbp; 201 infp->vsi_bp = bp; ··· 262 sizeof(struct vxfs_inode_info), 0, 263 SLAB_RECLAIM_ACCOUNT, NULL, NULL); 264 if (vxfs_inode_cachep) 265 - return (register_filesystem(&vxfs_fs_type)); 266 return -ENOMEM; 267 } 268
··· 155 156 sbp->s_flags |= MS_RDONLY; 157 158 + infp = kcalloc(1, sizeof(*infp), GFP_KERNEL); 159 if (!infp) { 160 printk(KERN_WARNING "vxfs: unable to allocate incore superblock\n"); 161 return -ENOMEM; 162 } 163 164 bsize = sb_min_blocksize(sbp, BLOCK_SIZE); 165 if (!bsize) { ··· 196 #endif 197 198 sbp->s_magic = rsbp->vs_magic; 199 + sbp->s_fs_info = infp; 200 201 infp->vsi_raw = rsbp; 202 infp->vsi_bp = bp; ··· 263 sizeof(struct vxfs_inode_info), 0, 264 SLAB_RECLAIM_ACCOUNT, NULL, NULL); 265 if (vxfs_inode_cachep) 266 + return register_filesystem(&vxfs_fs_type); 267 return -ENOMEM; 268 } 269