tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

orangefs: use ORANGEFS_NAME_LEN everywhere; remove ORANGEFS_NAME_MAX

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

authored by

Martin Brandenburg and committed by
Mike Marshall 47b4948f ee70fca0

+20 -21
+1 -1
fs/orangefs/dcache.c
··· 32 32 new_op->upcall.req.lookup.parent_refn = parent->refn; 33 33 strncpy(new_op->upcall.req.lookup.d_name, 34 34 dentry->d_name.name, 35 - ORANGEFS_NAME_LEN); 35 + ORANGEFS_NAME_MAX); 36 36 37 37 gossip_debug(GOSSIP_DCACHE_DEBUG, 38 38 "%s:%s:%d interrupt flag [%d]\n",
+1 -1
fs/orangefs/downcall.h
··· 33 33 34 34 struct orangefs_getattr_response { 35 35 struct ORANGEFS_sys_attr_s attributes; 36 - char link_target[ORANGEFS_NAME_LEN]; 36 + char link_target[ORANGEFS_NAME_MAX]; 37 37 }; 38 38 39 39 struct orangefs_mkdir_response {
+9 -9
fs/orangefs/namei.c
··· 38 38 ORANGEFS_TYPE_METAFILE, mode); 39 39 40 40 strncpy(new_op->upcall.req.create.d_name, 41 - dentry->d_name.name, ORANGEFS_NAME_LEN); 41 + dentry->d_name.name, ORANGEFS_NAME_MAX); 42 42 43 43 ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); 44 44 ··· 116 116 gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %s\n", 117 117 __func__, dentry->d_name.name); 118 118 119 - if (dentry->d_name.len > (ORANGEFS_NAME_LEN - 1)) 119 + if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1)) 120 120 return ERR_PTR(-ENAMETOOLONG); 121 121 122 122 new_op = op_alloc(ORANGEFS_VFS_OP_LOOKUP); ··· 133 133 new_op->upcall.req.lookup.parent_refn = parent->refn; 134 134 135 135 strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name, 136 - ORANGEFS_NAME_LEN); 136 + ORANGEFS_NAME_MAX); 137 137 138 138 gossip_debug(GOSSIP_NAME_DEBUG, 139 139 "%s: doing lookup on %s under %pU,%d (follow=%s)\n", ··· 234 234 235 235 new_op->upcall.req.remove.parent_refn = parent->refn; 236 236 strncpy(new_op->upcall.req.remove.d_name, dentry->d_name.name, 237 - ORANGEFS_NAME_LEN); 237 + ORANGEFS_NAME_MAX); 238 238 239 239 ret = service_operation(new_op, "orangefs_unlink", 240 240 get_interruptible_flag(inode)); ··· 283 283 284 284 strncpy(new_op->upcall.req.sym.entry_name, 285 285 dentry->d_name.name, 286 - ORANGEFS_NAME_LEN); 287 - strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_LEN); 286 + ORANGEFS_NAME_MAX); 287 + strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_MAX); 288 288 289 289 ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); 290 290 ··· 347 347 ORANGEFS_TYPE_DIRECTORY, mode); 348 348 349 349 strncpy(new_op->upcall.req.mkdir.d_name, 350 - dentry->d_name.name, ORANGEFS_NAME_LEN); 350 + dentry->d_name.name, ORANGEFS_NAME_MAX); 351 351 352 352 ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); 353 353 ··· 420 420 421 421 strncpy(new_op->upcall.req.rename.d_old_name, 422 422 old_dentry->d_name.name, 423 - ORANGEFS_NAME_LEN); 423 + ORANGEFS_NAME_MAX); 424 424 strncpy(new_op->upcall.req.rename.d_new_name, 425 425 new_dentry->d_name.name, 426 - ORANGEFS_NAME_LEN); 426 + ORANGEFS_NAME_MAX); 427 427 428 428 ret = service_operation(new_op, 429 429 "orangefs_rename",
-1
fs/orangefs/orangefs-dev-proto.h
··· 46 46 * Misc constants. Please retain them as multiples of 8! 47 47 * Otherwise 32-64 bit interactions will be messed up :) 48 48 */ 49 - #define ORANGEFS_NAME_LEN 0x00000100 50 49 #define ORANGEFS_MAX_DEBUG_STRING_LEN 0x00000400 51 50 #define ORANGEFS_MAX_DEBUG_ARRAY_LEN 0x00000800 52 51
+1 -1
fs/orangefs/super.c
··· 170 170 buf->f_type = sb->s_magic; 171 171 memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid)); 172 172 buf->f_bsize = new_op->downcall.resp.statfs.block_size; 173 - buf->f_namelen = ORANGEFS_NAME_LEN; 173 + buf->f_namelen = ORANGEFS_NAME_MAX; 174 174 175 175 buf->f_blocks = (sector_t) new_op->downcall.resp.statfs.blocks_total; 176 176 buf->f_bfree = (sector_t) new_op->downcall.resp.statfs.blocks_avail;
+8 -8
fs/orangefs/upcall.h
··· 27 27 __s32 sym_follow; 28 28 __s32 __pad1; 29 29 struct orangefs_object_kref parent_refn; 30 - char d_name[ORANGEFS_NAME_LEN]; 30 + char d_name[ORANGEFS_NAME_MAX]; 31 31 }; 32 32 33 33 struct orangefs_create_request_s { 34 34 struct orangefs_object_kref parent_refn; 35 35 struct ORANGEFS_sys_attr_s attributes; 36 - char d_name[ORANGEFS_NAME_LEN]; 36 + char d_name[ORANGEFS_NAME_MAX]; 37 37 }; 38 38 39 39 struct orangefs_symlink_request_s { 40 40 struct orangefs_object_kref parent_refn; 41 41 struct ORANGEFS_sys_attr_s attributes; 42 - char entry_name[ORANGEFS_NAME_LEN]; 43 - char target[ORANGEFS_NAME_LEN]; 42 + char entry_name[ORANGEFS_NAME_MAX]; 43 + char target[ORANGEFS_NAME_MAX]; 44 44 }; 45 45 46 46 struct orangefs_getattr_request_s { ··· 56 56 57 57 struct orangefs_remove_request_s { 58 58 struct orangefs_object_kref parent_refn; 59 - char d_name[ORANGEFS_NAME_LEN]; 59 + char d_name[ORANGEFS_NAME_MAX]; 60 60 }; 61 61 62 62 struct orangefs_mkdir_request_s { 63 63 struct orangefs_object_kref parent_refn; 64 64 struct ORANGEFS_sys_attr_s attributes; 65 - char d_name[ORANGEFS_NAME_LEN]; 65 + char d_name[ORANGEFS_NAME_MAX]; 66 66 }; 67 67 68 68 struct orangefs_readdir_request_s { ··· 84 84 struct orangefs_rename_request_s { 85 85 struct orangefs_object_kref old_parent_refn; 86 86 struct orangefs_object_kref new_parent_refn; 87 - char d_old_name[ORANGEFS_NAME_LEN]; 88 - char d_new_name[ORANGEFS_NAME_LEN]; 87 + char d_old_name[ORANGEFS_NAME_MAX]; 88 + char d_new_name[ORANGEFS_NAME_MAX]; 89 89 }; 90 90 91 91 struct orangefs_statfs_request_s {