Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b4948f authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: use ORANGEFS_NAME_LEN everywhere; remove ORANGEFS_NAME_MAX 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent ee70fca0

fs/orangefs/dcache.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ static int orangefs_revalidate_lookup(struct dentry *dentry) 
	new_op->upcall.req.lookup.parent_refn = parent->refn;

	new_op->upcall.req.lookup.parent_refn = parent->refn;

	strncpy(new_op->upcall.req.lookup.d_name,

	strncpy(new_op->upcall.req.lookup.d_name,

		dentry->d_name.name,

		dentry->d_name.name,

		ORANGEFS_NAME_LEN);

		ORANGEFS_NAME_MAX);





	gossip_debug(GOSSIP_DCACHE_DEBUG,

	gossip_debug(GOSSIP_DCACHE_DEBUG,

		     "%s:%s:%d interrupt flag [%d]\n",

		     "%s:%s:%d interrupt flag [%d]\n",

fs/orangefs/downcall.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ struct orangefs_symlink_response { 




struct orangefs_getattr_response {

struct orangefs_getattr_response {

	struct ORANGEFS_sys_attr_s attributes;

	struct ORANGEFS_sys_attr_s attributes;

	char link_target[ORANGEFS_NAME_LEN];

	char link_target[ORANGEFS_NAME_MAX];

};

};





struct orangefs_mkdir_response {

struct orangefs_mkdir_response {

fs/orangefs/namei.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static int orangefs_create(struct inode *dir, 
			       ORANGEFS_TYPE_METAFILE, mode);

			       ORANGEFS_TYPE_METAFILE, mode);





	strncpy(new_op->upcall.req.create.d_name,

	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));

	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",

	gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %s\n",

		     __func__, dentry->d_name.name);

		     __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);

		return ERR_PTR(-ENAMETOOLONG);





	new_op = op_alloc(ORANGEFS_VFS_OP_LOOKUP);

	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;

	new_op->upcall.req.lookup.parent_refn = parent->refn;





	strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name,

	strncpy(new_op->upcall.req.lookup.d_name, dentry->d_name.name,

		ORANGEFS_NAME_LEN);

		ORANGEFS_NAME_MAX);





	gossip_debug(GOSSIP_NAME_DEBUG,

	gossip_debug(GOSSIP_NAME_DEBUG,

		     "%s: doing lookup on %s under %pU,%d (follow=%s)\n",

		     "%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;

	new_op->upcall.req.remove.parent_refn = parent->refn;

	strncpy(new_op->upcall.req.remove.d_name, dentry->d_name.name,

	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",

	ret = service_operation(new_op, "orangefs_unlink",

				get_interruptible_flag(inode));

				get_interruptible_flag(inode));
@@ -283,8 +283,8 @@ static int orangefs_symlink(struct inode *dir, 




	strncpy(new_op->upcall.req.sym.entry_name,

	strncpy(new_op->upcall.req.sym.entry_name,

		dentry->d_name.name,

		dentry->d_name.name,

		ORANGEFS_NAME_LEN);

		ORANGEFS_NAME_MAX);

	strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_LEN);

	strncpy(new_op->upcall.req.sym.target, symname, ORANGEFS_NAME_MAX);





	ret = service_operation(new_op, __func__, get_interruptible_flag(dir));

	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);

			      ORANGEFS_TYPE_DIRECTORY, mode);





	strncpy(new_op->upcall.req.mkdir.d_name,

	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));

	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,

	strncpy(new_op->upcall.req.rename.d_old_name,

		old_dentry->d_name.name,

		old_dentry->d_name.name,

		ORANGEFS_NAME_LEN);

		ORANGEFS_NAME_MAX);

	strncpy(new_op->upcall.req.rename.d_new_name,

	strncpy(new_op->upcall.req.rename.d_new_name,

		new_dentry->d_name.name,

		new_dentry->d_name.name,

		ORANGEFS_NAME_LEN);

		ORANGEFS_NAME_MAX);





	ret = service_operation(new_op,

	ret = service_operation(new_op,

				"orangefs_rename",

				"orangefs_rename",

fs/orangefs/orangefs-dev-proto.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,6 @@ 
 * Misc constants. Please retain them as multiples of 8!

 * Misc constants. Please retain them as multiples of 8!

 * Otherwise 32-64 bit interactions will be messed up :)

 * 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_STRING_LEN	0x00000400

#define ORANGEFS_MAX_DEBUG_ARRAY_LEN	0x00000800

#define ORANGEFS_MAX_DEBUG_ARRAY_LEN	0x00000800

fs/orangefs/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -170,7 +170,7 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_type = sb->s_magic;

	buf->f_type = sb->s_magic;

	memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid));

	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_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_blocks = (sector_t) new_op->downcall.resp.statfs.blocks_total;

	buf->f_bfree = (sector_t) new_op->downcall.resp.statfs.blocks_avail;

	buf->f_bfree = (sector_t) new_op->downcall.resp.statfs.blocks_avail;