From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:39420 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbeEVUij (ORCPT ); Tue, 22 May 2018 16:38:39 -0400 From: Gabriel Krisman Bertazi To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, Gabriel Krisman Bertazi Subject: [PATCH NOMERGE 10/13] ext4: Plumb LOOK_CASEFOLD up to ext4 comparison functions Date: Tue, 22 May 2018 17:38:15 -0300 Message-Id: <20180522203818.14666-11-krisman@collabora.co.uk> In-Reply-To: <20180522203818.14666-1-krisman@collabora.co.uk> References: <20180522203818.14666-1-krisman@collabora.co.uk> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: We also ignore the flags when creating a file, this means we allow files to be created who only differ by case folding. Signed-off-by: Gabriel Krisman Bertazi --- fs/ext4/ext4.h | 6 ++++-- fs/ext4/inline.c | 7 ++++--- fs/ext4/namei.c | 50 +++++++++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 22f49d7d3efc..ebda06e4cb24 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2505,7 +2505,8 @@ extern int ext4_search_dir(struct buffer_head *bh, struct inode *dir, struct ext4_filename *fname, unsigned int offset, - struct ext4_dir_entry_2 **res_dir); + struct ext4_dir_entry_2 **res_dir, + unsigned int flags); extern int ext4_generic_delete_entry(handle_t *handle, struct inode *dir, struct ext4_dir_entry_2 *de_del, @@ -2991,7 +2992,8 @@ extern int htree_inlinedir_to_tree(struct file *dir_file, extern struct buffer_head *ext4_find_inline_entry(struct inode *dir, struct ext4_filename *fname, struct ext4_dir_entry_2 **res_dir, - int *has_inline_data); + int *has_inline_data, + unsigned int flags); extern int ext4_delete_inline_entry(handle_t *handle, struct inode *dir, struct ext4_dir_entry_2 *de_del, diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 70cf4c7b268a..273d28a9c0b7 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1612,7 +1612,8 @@ int ext4_try_create_inline_dir(handle_t *handle, struct inode *parent, struct buffer_head *ext4_find_inline_entry(struct inode *dir, struct ext4_filename *fname, struct ext4_dir_entry_2 **res_dir, - int *has_inline_data) + int *has_inline_data, + unsigned int flags) { int ret; struct ext4_iloc iloc; @@ -1632,7 +1633,7 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir, EXT4_INLINE_DOTDOT_SIZE; inline_size = EXT4_MIN_INLINE_DATA_SIZE - EXT4_INLINE_DOTDOT_SIZE; ret = ext4_search_dir(iloc.bh, inline_start, inline_size, - dir, fname, 0, res_dir); + dir, fname, 0, res_dir, flags); if (ret == 1) goto out_find; if (ret < 0) @@ -1645,7 +1646,7 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir, inline_size = ext4_get_inline_size(dir) - EXT4_MIN_INLINE_DATA_SIZE; ret = ext4_search_dir(iloc.bh, inline_start, inline_size, - dir, fname, 0, res_dir); + dir, fname, 0, res_dir, flags); if (ret == 1) goto out_find; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index b1f21e3a0763..3373017e9315 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "ext4.h" #include "ext4_jbd2.h" @@ -273,7 +274,8 @@ static int ext4_htree_next_block(struct inode *dir, __u32 hash, __u32 *start_hash); static struct buffer_head * ext4_dx_find_entry(struct inode *dir, struct ext4_filename *fname, - struct ext4_dir_entry_2 **res_dir); + struct ext4_dir_entry_2 **res_dir, + unsigned int flags); static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname, struct inode *dir, struct inode *inode); @@ -1172,10 +1174,11 @@ static inline int search_dirblock(struct buffer_head *bh, struct inode *dir, struct ext4_filename *fname, unsigned int offset, - struct ext4_dir_entry_2 **res_dir) + struct ext4_dir_entry_2 **res_dir, + unsigned int flags) { return ext4_search_dir(bh, bh->b_data, dir->i_sb->s_blocksize, dir, - fname, offset, res_dir); + fname, offset, res_dir, flags); } /* @@ -1257,7 +1260,8 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) * Return: %true if the directory entry matches, otherwise %false. */ static inline bool ext4_match(const struct ext4_filename *fname, - const struct ext4_dir_entry_2 *de) + const struct ext4_dir_entry_2 *de, + bool casefold) { struct fscrypt_name f; @@ -1277,7 +1281,8 @@ static inline bool ext4_match(const struct ext4_filename *fname, */ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, struct inode *dir, struct ext4_filename *fname, - unsigned int offset, struct ext4_dir_entry_2 **res_dir) + unsigned int offset, struct ext4_dir_entry_2 **res_dir, + unsigned int flags) { struct ext4_dir_entry_2 * de; char * dlimit; @@ -1289,7 +1294,7 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size, /* this code is executed quadratically often */ /* do minimal checking `by hand' */ if ((char *) de + de->name_len <= dlimit && - ext4_match(fname, de)) { + ext4_match(fname, de, flags & LOOKUP_CASEFOLD)) { /* found a match - just to be sure, do * a full check */ if (ext4_check_dir_entry(dir, NULL, de, bh, bh->b_data, @@ -1339,7 +1344,7 @@ static int is_dx_internal_node(struct inode *dir, ext4_lblk_t block, static struct buffer_head * ext4_find_entry (struct inode *dir, const struct qstr *d_name, struct ext4_dir_entry_2 **res_dir, - int *inlined) + int *inlined, unsigned int flags) { struct super_block *sb; struct buffer_head *bh_use[NAMEI_RA_SIZE]; @@ -1369,7 +1374,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, if (ext4_has_inline_data(dir)) { int has_inline_data = 1; ret = ext4_find_inline_entry(dir, &fname, res_dir, - &has_inline_data); + &has_inline_data, flags); if (has_inline_data) { if (inlined) *inlined = 1; @@ -1388,7 +1393,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, goto restart; } if (is_dx(dir)) { - ret = ext4_dx_find_entry(dir, &fname, res_dir); + ret = ext4_dx_find_entry(dir, &fname, res_dir, flags); /* * On success, or if the error was file not found, * return. Otherwise, fall back to doing a search the @@ -1452,7 +1457,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, } set_buffer_verified(bh); i = search_dirblock(bh, dir, &fname, - block << EXT4_BLOCK_SIZE_BITS(sb), res_dir); + block << EXT4_BLOCK_SIZE_BITS(sb), res_dir, flags); if (i == 1) { EXT4_I(dir)->i_dir_start_lookup = block; ret = bh; @@ -1488,7 +1493,8 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, static struct buffer_head * ext4_dx_find_entry(struct inode *dir, struct ext4_filename *fname, - struct ext4_dir_entry_2 **res_dir) + struct ext4_dir_entry_2 **res_dir, + unsigned int flags) { struct super_block * sb = dir->i_sb; struct dx_frame frames[EXT4_HTREE_LEVEL], *frame; @@ -1510,7 +1516,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, retval = search_dirblock(bh, dir, fname, block << EXT4_BLOCK_SIZE_BITS(sb), - res_dir); + res_dir, flags); if (retval == 1) goto success; brelse(bh); @@ -1553,7 +1559,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi if (dentry->d_name.len > EXT4_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); - bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL); + bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL, flags); if (IS_ERR(bh)) return (struct dentry *) bh; inode = NULL; @@ -1597,7 +1603,7 @@ struct dentry *ext4_get_parent(struct dentry *child) struct ext4_dir_entry_2 * de; struct buffer_head *bh; - bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL); + bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL, 0); if (IS_ERR(bh)) return (struct dentry *) bh; if (!bh) @@ -1796,7 +1802,7 @@ int ext4_find_dest_de(struct inode *dir, struct inode *inode, if (ext4_check_dir_entry(dir, NULL, de, bh, buf, buf_size, offset)) return -EFSCORRUPTED; - if (ext4_match(fname, de)) + if (ext4_match(fname, de, false)) return -EEXIST; nlen = EXT4_DIR_REC_LEN(de->name_len); rlen = ext4_rec_len_from_disk(de->rec_len, buf_size); @@ -2925,7 +2931,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) return retval; retval = -ENOENT; - bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL); + bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL, 0); if (IS_ERR(bh)) return PTR_ERR(bh); if (!bh) @@ -3002,7 +3008,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) return retval; retval = -ENOENT; - bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL); + bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL, 0); if (IS_ERR(bh)) return PTR_ERR(bh); if (!bh) @@ -3364,7 +3370,7 @@ static int ext4_find_delete_entry(handle_t *handle, struct inode *dir, struct buffer_head *bh; struct ext4_dir_entry_2 *de; - bh = ext4_find_entry(dir, d_name, &de, NULL); + bh = ext4_find_entry(dir, d_name, &de, NULL, 0); if (IS_ERR(bh)) return PTR_ERR(bh); if (bh) { @@ -3499,7 +3505,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, return retval; } - old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL); + old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL, 0); if (IS_ERR(old.bh)) return PTR_ERR(old.bh); /* @@ -3513,7 +3519,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, goto end_rename; new.bh = ext4_find_entry(new.dir, &new.dentry->d_name, - &new.de, &new.inlined); + &new.de, &new.inlined, 0); if (IS_ERR(new.bh)) { retval = PTR_ERR(new.bh); new.bh = NULL; @@ -3693,7 +3699,7 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, return retval; old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, - &old.de, &old.inlined); + &old.de, &old.inlined, 0); if (IS_ERR(old.bh)) return PTR_ERR(old.bh); /* @@ -3707,7 +3713,7 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, goto end_rename; new.bh = ext4_find_entry(new.dir, &new.dentry->d_name, - &new.de, &new.inlined); + &new.de, &new.inlined, 0); if (IS_ERR(new.bh)) { retval = PTR_ERR(new.bh); new.bh = NULL; -- 2.17.0