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

Commit fb523f32 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

minix: remove !NO_TRUNCATE code 



This patch removes the !NO_TRUNCATE code that anyway required a manual
editing of the code for being used.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bbcd6d54

fs/minix/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -256,9 +256,6 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 
	if (!s->s_root)

		goto out_iput;



	if (!NO_TRUNCATE)

		s->s_root->d_op = &minix_dentry_operations;



	if (!(s->s_flags & MS_RDONLY)) {

		if (sbi->s_version != MINIX_V3) /* s_state is now out from V3 sb */

			ms->s_state &= ~MINIX_VALID_FS;

fs/minix/minix.h

+0 −6
Original line number Diff line number Diff line
@@ -2,11 +2,6 @@ 
#include <linux/pagemap.h>

#include <linux/minix_fs.h>



/*

 * change the define below to 0 if you want names > info->s_namelen chars to be

 * truncated. Else they will be disallowed (ENAMETOOLONG).

 */

#define NO_TRUNCATE 1

#define INODE_VERSION(inode)	minix_sb(inode->i_sb)->s_version

#define MINIX_V1		0x0001		/* original minix fs */

#define MINIX_V2		0x0002		/* minix V2 fs */
@@ -83,7 +78,6 @@ extern const struct inode_operations minix_file_inode_operations; 
extern const struct inode_operations minix_dir_inode_operations;

extern const struct file_operations minix_file_operations;

extern const struct file_operations minix_dir_operations;

extern struct dentry_operations minix_dentry_operations;



static inline struct minix_sb_info *minix_sb(struct super_block *sb)

{

fs/minix/namei.c

+0 −24
Original line number Diff line number Diff line
@@ -18,30 +18,6 @@ static int add_nondir(struct dentry *dentry, struct inode *inode) 
	return err;

}



static int minix_hash(struct dentry *dentry, struct qstr *qstr)

{

	unsigned long hash;

	int i;

	const unsigned char *name;



	i = minix_sb(dentry->d_inode->i_sb)->s_namelen;

	if (i >= qstr->len)

		return 0;

	/* Truncate the name in place, avoids having to define a compare

	   function. */

	qstr->len = i;

	name = qstr->name;

	hash = init_name_hash();

	while (i--)

		hash = partial_name_hash(*name++, hash);

	qstr->hash = end_name_hash(hash);

	return 0;

}



struct dentry_operations minix_dentry_operations = {

	.d_hash		= minix_hash,

};



static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)

{

	struct inode * inode = NULL;