From 47b4948fdb1055cd8d8f86aebb0b3fcb06ba36d5 Mon Sep 17 00:00:00 2001 From: Martin Brandenburg Date: Sat, 20 Feb 2016 14:22:40 -0500 Subject: [PATCH] orangefs: use ORANGEFS_NAME_LEN everywhere; remove ORANGEFS_NAME_MAX Signed-off-by: Martin Brandenburg Signed-off-by: Mike Marshall --- fs/orangefs/dcache.c | 2 +- fs/orangefs/downcall.h | 2 +- fs/orangefs/namei.c | 18 +++++++++--------- fs/orangefs/orangefs-dev-proto.h | 1 - fs/orangefs/super.c | 2 +- fs/orangefs/upcall.h | 16 ++++++++-------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/fs/orangefs/dcache.c b/fs/orangefs/dcache.c index 3c1703fbb60e..2de92b71d861 100644 --- a/fs/orangefs/dcache.c +++ b/fs/orangefs/dcache.c @@ -32,7 +32,7 @@ static int orangefs_revalidate_lookup(struct dentry *dentry) new_op->upcall.req.lookup.parent_refn = parent->refn; strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name, - ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); gossip_debug(GOSSIP_DCACHE_DEBUG, "%s:%s:%d interrupt flag [%d]\n", diff --git a/fs/orangefs/downcall.h b/fs/orangefs/downcall.h index 72d4cac54821..66b99210f1f9 100644 --- a/fs/orangefs/downcall.h +++ b/fs/orangefs/downcall.h @@ -33,7 +33,7 @@ struct orangefs_symlink_response { struct orangefs_getattr_response { struct ORANGEFS_sys_attr_s attributes; - char link_target[ORANGEFS_NAME_LEN]; + char link_target[ORANGEFS_NAME_MAX]; }; struct orangefs_mkdir_response { diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c index b3ae3749a932..f26f6694c48d 100644 --- a/fs/orangefs/namei.c +++ b/fs/orangefs/namei.c @@ -38,7 +38,7 @@ static int orangefs_create(struct inode *dir, ORANGEFS_TYPE_METAFILE, mode); strncpy(new_op->upcall.req.create.d_name, - dentry->d_name.name, ORANGEFS_NAME_LEN); + dentry->d_name.name, ORANGEFS_NAME_MAX); ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); @@ -116,7 +116,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry, gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %s\n", __func__, dentry->d_name.name); - if (dentry->d_name.len > (ORANGEFS_NAME_LEN - 1)) + if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1)) return ERR_PTR(-ENAMETOOLONG); new_op = op_alloc(ORANGEFS_VFS_OP_LOOKUP); @@ -133,7 +133,7 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry, new_op->upcall.req.lookup.parent_refn = parent->refn; strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name, - ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); gossip_debug(GOSSIP_NAME_DEBUG, "%s: doing lookup on %s under %pU,%d (follow=%s)\n", @@ -234,7 +234,7 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry) new_op->upcall.req.remove.parent_refn = parent->refn; strncpy(new_op->upcall.req.remove.d_name, dentry->d_name.name, - ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); ret = service_operation(new_op, "orangefs_unlink", get_interruptible_flag(inode)); @@ -283,8 +283,8 @@ static int orangefs_symlink(struct inode *dir, strncpy(new_op->upcall.req.sym.entry_name, dentry->d_name.name, - ORANGEFS_NAME_LEN); - strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); + strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_MAX); ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); @@ -347,7 +347,7 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode ORANGEFS_TYPE_DIRECTORY, mode); strncpy(new_op->upcall.req.mkdir.d_name, - dentry->d_name.name, ORANGEFS_NAME_LEN); + dentry->d_name.name, ORANGEFS_NAME_MAX); ret = service_operation(new_op, __func__, get_interruptible_flag(dir)); @@ -420,10 +420,10 @@ static int orangefs_rename(struct inode *old_dir, strncpy(new_op->upcall.req.rename.d_old_name, old_dentry->d_name.name, - ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); strncpy(new_op->upcall.req.rename.d_new_name, new_dentry->d_name.name, - ORANGEFS_NAME_LEN); + ORANGEFS_NAME_MAX); ret = service_operation(new_op, "orangefs_rename", diff --git a/fs/orangefs/orangefs-dev-proto.h b/fs/orangefs/orangefs-dev-proto.h index 5a8725a88eac..9eac9d9a3f3a 100644 --- a/fs/orangefs/orangefs-dev-proto.h +++ b/fs/orangefs/orangefs-dev-proto.h @@ -46,7 +46,6 @@ * Misc constants. Please retain them as multiples of 8! * Otherwise 32-64 bit interactions will be messed up :) */ -#define ORANGEFS_NAME_LEN 0x00000100 #define ORANGEFS_MAX_DEBUG_STRING_LEN 0x00000400 #define ORANGEFS_MAX_DEBUG_ARRAY_LEN 0x00000800 diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 65ddc74e96b6..eac24eb7fe80 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -170,7 +170,7 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_type = sb->s_magic; memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid)); buf->f_bsize = new_op->downcall.resp.statfs.block_size; - buf->f_namelen = ORANGEFS_NAME_LEN; + buf->f_namelen = ORANGEFS_NAME_MAX; buf->f_blocks = (sector_t) new_op->downcall.resp.statfs.blocks_total; buf->f_bfree = (sector_t) new_op->downcall.resp.statfs.blocks_avail; diff --git a/fs/orangefs/upcall.h b/fs/orangefs/upcall.h index 781cbc38523a..af6dcac180ab 100644 --- a/fs/orangefs/upcall.h +++ b/fs/orangefs/upcall.h @@ -27,20 +27,20 @@ struct orangefs_lookup_request_s { __s32 sym_follow; __s32 __pad1; struct orangefs_object_kref parent_refn; - char d_name[ORANGEFS_NAME_LEN]; + char d_name[ORANGEFS_NAME_MAX]; }; struct orangefs_create_request_s { struct orangefs_object_kref parent_refn; struct ORANGEFS_sys_attr_s attributes; - char d_name[ORANGEFS_NAME_LEN]; + char d_name[ORANGEFS_NAME_MAX]; }; struct orangefs_symlink_request_s { struct orangefs_object_kref parent_refn; struct ORANGEFS_sys_attr_s attributes; - char entry_name[ORANGEFS_NAME_LEN]; - char target[ORANGEFS_NAME_LEN]; + char entry_name[ORANGEFS_NAME_MAX]; + char target[ORANGEFS_NAME_MAX]; }; struct orangefs_getattr_request_s { @@ -56,13 +56,13 @@ struct orangefs_setattr_request_s { struct orangefs_remove_request_s { struct orangefs_object_kref parent_refn; - char d_name[ORANGEFS_NAME_LEN]; + char d_name[ORANGEFS_NAME_MAX]; }; struct orangefs_mkdir_request_s { struct orangefs_object_kref parent_refn; struct ORANGEFS_sys_attr_s attributes; - char d_name[ORANGEFS_NAME_LEN]; + char d_name[ORANGEFS_NAME_MAX]; }; struct orangefs_readdir_request_s { @@ -84,8 +84,8 @@ struct orangefs_readdirplus_request_s { struct orangefs_rename_request_s { struct orangefs_object_kref old_parent_refn; struct orangefs_object_kref new_parent_refn; - char d_old_name[ORANGEFS_NAME_LEN]; - char d_new_name[ORANGEFS_NAME_LEN]; + char d_old_name[ORANGEFS_NAME_MAX]; + char d_new_name[ORANGEFS_NAME_MAX]; }; struct orangefs_statfs_request_s { -- 2.20.1