The patch titled minix: remove !NO_TRUNCATE code has been removed from the -mm tree. Its filename was minix-remove-no_truncate-code.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: minix: remove !NO_TRUNCATE code From: Adrian Bunk <bunk@xxxxxxxxxx> This patch removes the !NO_TRUNCATE code that anyway required a manual editing of the code for being used. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/minix/inode.c | 3 --- fs/minix/minix.h | 6 ------ fs/minix/namei.c | 24 ------------------------ 3 files changed, 33 deletions(-) diff -puN fs/minix/inode.c~minix-remove-no_truncate-code fs/minix/inode.c --- a/fs/minix/inode.c~minix-remove-no_truncate-code +++ a/fs/minix/inode.c @@ -256,9 +256,6 @@ static int minix_fill_super(struct super 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; diff -puN fs/minix/minix.h~minix-remove-no_truncate-code fs/minix/minix.h --- a/fs/minix/minix.h~minix-remove-no_truncate-code +++ a/fs/minix/minix.h @@ -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 min 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) { diff -puN fs/minix/namei.c~minix-remove-no_truncate-code fs/minix/namei.c --- a/fs/minix/namei.c~minix-remove-no_truncate-code +++ a/fs/minix/namei.c @@ -18,30 +18,6 @@ static int add_nondir(struct dentry *den 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; _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are origin.patch uninline-arch_pick_mmap_layout.patch include-video-atmel_lcdch-must-include-linux-workqueueh.patch linux-next.patch m32r-remove-the-unused-nohighmem-option.patch if-0-ses_match_host.patch git-xtensa.patch include-linux-kernelh-userspace-header-cleanup.patch parport-sharec-proper-externs.patch tpm_biosc-make-2-structs-static.patch drm-make-drm_minors_cleanup-static.patch make-cgroup_seqfile_release-static.patch make-pnp_add_card_id-static.patch make-parport_cs_release-static.patch make-mm-sparsec-make-a-function-static.patch mm-allocpercpuc-make-4-functions-static.patch make-mm-memoryc-print_bad_pte-static.patch mm-swapfilec-make-code-static.patch make-mm-rmapc-anon_vma_cachep-static.patch drivers-char-rtcc-make-2-functions-static.patch make-init-do_mountsc-root_device_name-static.patch make-macfb_setup-static.patch video-console-sticonrec-make-code-static.patch video-console-sticonrec-make-code-static-checkpatch-fixes.patch video-stifbc-make-2-functions-static.patch reiser4.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html