The ext4_add_dot_dotdot() will do cleanup work (zeroing i_nlink, iput)
when ext4_bread() fails, that will mess up the i_nlink and i_count if
the ext4_add_dot_dotdot() is called from lustre.
The error cleanup work should be moved from ext4_add_dot_dotdot() to
it's caller: ext4_mkdir().
Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: I8e8a328c26bf5d603ca26c94a5a04cf8bd1c7b4f
Reviewed-on: http://review.whamcloud.com/1079
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
error_msg = "rec_len is too small for name_len";
else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
error_msg = "directory entry across blocks";
error_msg = "rec_len is too small for name_len";
else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
error_msg = "directory entry across blocks";
-@@ -181,7 +188,7 @@ revalidate:
+@@ -182,7 +189,7 @@ revalidate:
* failure will be detected in the
* dirent test below. */
if (ext4_rec_len_from_disk(de->rec_len,
* failure will be detected in the
* dirent test below. */
if (ext4_rec_len_from_disk(de->rec_len,
break;
i += ext4_rec_len_from_disk(de->rec_len,
sb->s_blocksize);
break;
i += ext4_rec_len_from_disk(de->rec_len,
sb->s_blocksize);
-@@ -344,12 +351,17 @@ int ext4_htree_store_dirent(struct file
+@@ -345,12 +352,17 @@ int ext4_htree_store_dirent(struct file
struct fname *fname, *new_fn;
struct dir_private_info *info;
int len;
struct fname *fname, *new_fn;
struct dir_private_info *info;
int len;
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)
return -ENOMEM;
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)
return -ENOMEM;
-@@ -358,7 +370,7 @@ int ext4_htree_store_dirent(struct file
+@@ -359,7 +371,7 @@ int ext4_htree_store_dirent(struct file
new_fn->inode = le32_to_cpu(dirent->inode);
new_fn->name_len = dirent->name_len;
new_fn->file_type = dirent->file_type;
new_fn->inode = le32_to_cpu(dirent->inode);
new_fn->name_len = dirent->name_len;
new_fn->file_type = dirent->file_type;
===================================================================
--- linux-stage.orig/fs/ext4/ext4.h
+++ linux-stage/fs/ext4/ext4.h
===================================================================
--- linux-stage.orig/fs/ext4/ext4.h
+++ linux-stage/fs/ext4/ext4.h
-@@ -1187,6 +1187,7 @@ static inline void ext4_clear_inode_stat
+@@ -1267,6 +1267,7 @@ EXT4_INODE_BIT_FNS(state, state_flags)
#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
-@@ -1195,7 +1196,9 @@ static inline void ext4_clear_inode_stat
+@@ -1275,7 +1276,9 @@ EXT4_INODE_BIT_FNS(state, state_flags)
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
EXT4_FEATURE_INCOMPAT_FLEX_BG| \
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
EXT4_FEATURE_INCOMPAT_FLEX_BG| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -1277,6 +1280,43 @@ struct ext4_dir_entry_2 {
+@@ -1357,6 +1360,43 @@ struct ext4_dir_entry_2 {
#define EXT4_FT_SYMLINK 7
#define EXT4_FT_MAX 8
#define EXT4_FT_SYMLINK 7
#define EXT4_FT_MAX 8
/*
* EXT4_DIR_PAD defines the directory entries boundaries
/*
* EXT4_DIR_PAD defines the directory entries boundaries
-@@ -1285,8 +1325,11 @@ struct ext4_dir_entry_2 {
+@@ -1365,8 +1405,11 @@ struct ext4_dir_entry_2 {
*/
#define EXT4_DIR_PAD 4
#define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
*/
#define EXT4_DIR_PAD 4
#define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
#define EXT4_MAX_REC_LEN ((1<<16)-1)
static inline unsigned int
#define EXT4_MAX_REC_LEN ((1<<16)-1)
static inline unsigned int
-@@ -1613,7 +1656,7 @@ extern struct buffer_head * ext4_find_en
+@@ -1726,7 +1769,7 @@ extern struct buffer_head * ext4_find_en
struct ext4_dir_entry_2 ** res_dir);
#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(inode, &(dentry)->d_name, res_dir)
extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
struct ext4_dir_entry_2 ** res_dir);
#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(inode, &(dentry)->d_name, res_dir)
extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
extern struct buffer_head *ext4_append(handle_t *handle,
struct inode *inode,
ext4_lblk_t *block, int *err);
extern struct buffer_head *ext4_append(handle_t *handle,
struct inode *inode,
ext4_lblk_t *block, int *err);
-@@ -1944,6 +1987,28 @@ static inline void set_bitmap_uptodate(s
-
- #define in_range(b, first, len) ((b) >= (first) && (b) <= (first) + (len) - 1)
+@@ -2069,6 +2112,28 @@ extern wait_queue_head_t aio_wq[];
+ #define to_aio_wq(v) (&aio_wq[((unsigned long)v) % WQ_HASH_SZ])
+ extern void ext4_aio_wait(struct inode *inode);
+/*
+ * Compute the total directory entry data length.
+/*
+ * Compute the total directory entry data length.
if (IS_ERR(handle))
return PTR_ERR(handle);
if (IS_ERR(handle))
return PTR_ERR(handle);
-@@ -2007,17 +2043,32 @@ int ext4_add_dot_dotdot(handle_t *handle
+@@ -1996,28 +2032,40 @@ int ext4_add_dot_dotdot(handle_t *handle
+ inode->i_fop = &ext4_dir_operations;
+ inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize;
+ dir_block = ext4_bread(handle, inode, 0, 1, &err);
+- if (!dir_block) {
+- clear_nlink(inode);
+- ext4_mark_inode_dirty(handle, inode);
+- iput (inode);
++ if (!dir_block)
+ goto get_out;
+- }
++
+ BUFFER_TRACE(dir_block, "get_write_access");
+ ext4_journal_get_write_access(handle, dir_block);
de = (struct ext4_dir_entry_2 *) dir_block->b_data;
de->inode = cpu_to_le32(inode->i_ino);
de->name_len = 1;
de = (struct ext4_dir_entry_2 *) dir_block->b_data;
de->inode = cpu_to_le32(inode->i_ino);
de->name_len = 1;
inode->i_nlink = 2;
BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
ext4_handle_dirty_metadata(handle, dir, dir_block);
inode->i_nlink = 2;
BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
ext4_handle_dirty_metadata(handle, dir, dir_block);
-@@ -2054,7 +2105,7 @@ retry:
+@@ -2054,9 +2102,12 @@ retry:
if (IS_ERR(inode))
goto out_stop;
- err = ext4_add_dot_dotdot(handle, dir, inode);
+ err = ext4_add_dot_dotdot(handle, dir, inode, NULL, NULL);
if (err) {
if (IS_ERR(inode))
goto out_stop;
- err = ext4_add_dot_dotdot(handle, dir, inode);
+ err = ext4_add_dot_dotdot(handle, dir, inode, NULL, NULL);
if (err) {
++ ext4_mark_inode_dirty(handle, inode);
++ iput (inode);
@@ -2092,7 +2143,7 @@ static int empty_dir(struct inode *inode
int err = 0;
@@ -2092,7 +2143,7 @@ static int empty_dir(struct inode *inode
int err = 0;
make use of dentry->d_fsdata to pass fid to ext4. so no
changes in ext4_add_entry() interface required.
make use of dentry->d_fsdata to pass fid to ext4. so no
changes in ext4_add_entry() interface required.
+Index: linux-stage/fs/ext4/dir.c
===================================================================
===================================================================
---- a/fs/ext4/dir.c
-+++ b/fs/ext4/dir.c
+--- linux-stage.orig/fs/ext4/dir.c
++++ linux-stage/fs/ext4/dir.c
@@ -53,11 +53,18 @@ const struct file_operations ext4_dir_op
static unsigned char get_dtype(struct super_block *sb, int filetype)
@@ -53,11 +53,18 @@ const struct file_operations ext4_dir_op
static unsigned char get_dtype(struct super_block *sb, int filetype)
-@@ -69,11 +76,11 @@ int ext4_check_dir_entry (const char * f
- const char * error_msg = NULL;
- const int rlen = ext4_rec_len_from_disk(de->rec_len);
+@@ -70,11 +77,11 @@ int ext4_check_dir_entry(const char *fun
+ const int rlen = ext4_rec_len_from_disk(de->rec_len,
+ dir->i_sb->s_blocksize);
- if (rlen < EXT4_DIR_REC_LEN(1))
+ if (rlen < __EXT4_DIR_REC_LEN(1))
- if (rlen < EXT4_DIR_REC_LEN(1))
+ if (rlen < __EXT4_DIR_REC_LEN(1))
error_msg = "rec_len is too small for name_len";
else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
error_msg = "directory entry across blocks";
error_msg = "rec_len is too small for name_len";
else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
error_msg = "directory entry across blocks";
-@@ -175,7 +182,7 @@ revalidate:
+@@ -179,7 +186,7 @@ revalidate:
* failure will be detected in the
* dirent test below. */
* failure will be detected in the
* dirent test below. */
- if (ext4_rec_len_from_disk(de->rec_len,
+ if (ext4_rec_len_from_disk(de->rec_len,
- sb->s_blocksize) < EXT4_DIR_REC_LEN(1))
+ sb->s_blocksize) < __EXT4_DIR_REC_LEN(1))
break;
- sb->s_blocksize) < EXT4_DIR_REC_LEN(1))
+ sb->s_blocksize) < __EXT4_DIR_REC_LEN(1))
break;
- i += ext4_rec_len_from_disk(de->rec_len);
- }
-@@ -335,12 +342,17 @@ int ext4_htree_store_dirent(struct file
- struct fname * fname, *new_fn;
+ i += ext4_rec_len_from_disk(de->rec_len,
+ sb->s_blocksize);
+@@ -342,12 +349,17 @@ int ext4_htree_store_dirent(struct file
+ struct fname *fname, *new_fn;
struct dir_private_info *info;
int len;
+ int extra_data = 1;
struct dir_private_info *info;
int len;
+ int extra_data = 1;
- info = (struct dir_private_info *) dir_file->private_data;
- p = &info->root.rb_node;
+ info = (struct dir_private_info *) dir_file->private_data;
+ p = &info->root.rb_node;
/* Create and allocate the fname structure */
- len = sizeof(struct fname) + dirent->name_len + 1;
/* Create and allocate the fname structure */
- len = sizeof(struct fname) + dirent->name_len + 1;
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)
return -ENOMEM;
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)
return -ENOMEM;
-@@ -349,7 +361,7 @@ int ext4_htree_store_dirent(struct file
+@@ -356,7 +368,7 @@ int ext4_htree_store_dirent(struct file
new_fn->inode = le32_to_cpu(dirent->inode);
new_fn->name_len = dirent->name_len;
new_fn->file_type = dirent->file_type;
new_fn->inode = le32_to_cpu(dirent->inode);
new_fn->name_len = dirent->name_len;
new_fn->file_type = dirent->file_type;
new_fn->name[dirent->name_len] = 0;
while (*p) {
new_fn->name[dirent->name_len] = 0;
while (*p) {
+Index: linux-stage/fs/ext4/ext4.h
===================================================================
===================================================================
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -771,6 +771,7 @@ static inline int ext4_valid_inum(struct
+--- linux-stage.orig/fs/ext4/ext4.h
++++ linux-stage/fs/ext4/ext4.h
+@@ -1172,6 +1172,7 @@ static inline void ext4_clear_inode_stat
#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
#define EXT4_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
#define EXT4_FEATURE_INCOMPAT_SUPP (EXT4_FEATURE_INCOMPAT_FILETYPE| \
-@@ -779,7 +780,9 @@ static inline int ext4_valid_inum(struct
+@@ -1180,7 +1181,9 @@ static inline void ext4_clear_inode_stat
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
EXT4_FEATURE_INCOMPAT_FLEX_BG| \
EXT4_FEATURE_INCOMPAT_EXTENTS| \
EXT4_FEATURE_INCOMPAT_64BIT| \
EXT4_FEATURE_INCOMPAT_FLEX_BG| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
#define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -847,6 +850,43 @@ struct ext4_dir_entry_2 {
+@@ -1262,6 +1265,43 @@ struct ext4_dir_entry_2 {
#define EXT4_FT_SYMLINK 7
#define EXT4_FT_MAX 8
#define EXT4_FT_SYMLINK 7
#define EXT4_FT_MAX 8
/*
* EXT4_DIR_PAD defines the directory entries boundaries
/*
* EXT4_DIR_PAD defines the directory entries boundaries
-@@ -855,8 +895,11 @@ struct ext4_dir_entry_2 {
+@@ -1270,8 +1310,11 @@ struct ext4_dir_entry_2 {
*/
#define EXT4_DIR_PAD 4
#define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
*/
#define EXT4_DIR_PAD 4
#define EXT4_DIR_ROUND (EXT4_DIR_PAD - 1)
+
#define EXT4_MAX_REC_LEN ((1<<16)-1)
+
#define EXT4_MAX_REC_LEN ((1<<16)-1)
- static inline unsigned ext4_rec_len_from_disk(__le16 dlen)
-@@ -1155,7 +1198,7 @@ extern struct buffer_head * ext4_find_en
- struct ext4_dir_entry_2
- ** res_dir);
+ static inline unsigned int
+@@ -1611,7 +1654,7 @@ extern struct buffer_head * ext4_find_en
+ struct ext4_dir_entry_2 ** res_dir);
+ #define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(dir, &(dentry)->d_name, res_dir)
extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
- struct inode *inode);
+ struct inode *inode, const void *, const void *);
extern int ext4_orphan_add(handle_t *, struct inode *);
extern int ext4_orphan_del(handle_t *, struct inode *);
extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
- struct inode *inode);
+ struct inode *inode, const void *, const void *);
extern int ext4_orphan_add(handle_t *, struct inode *);
extern int ext4_orphan_del(handle_t *, struct inode *);
extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
-@@ -1343,6 +1386,28 @@ static inline int ext4_is_group_locked(s
-
- return spin_is_locked(ext4_group_lock_ptr(sb, group));
+@@ -1809,6 +1852,28 @@ static inline void ext4_update_i_disksiz
+ up_write(&EXT4_I(inode)->i_data_sem);
+ return ;
}
+/*
+ * Compute the total directory entry data length.
}
+/*
+ * Compute the total directory entry data length.
- #endif /* __KERNEL__ */
-
-Index: b/fs/ext4/namei.c
+ struct ext4_group_info {
+ unsigned long bb_state;
+Index: linux-stage/fs/ext4/namei.c
===================================================================
===================================================================
---- a/fs/ext4/namei.c
-+++ b/fs/ext4/namei.c
-@@ -177,7 +177,8 @@ static unsigned dx_get_count (struct dx_
- static unsigned dx_get_limit (struct dx_entry *entries);
+--- linux-stage.orig/fs/ext4/namei.c
++++ linux-stage/fs/ext4/namei.c
+@@ -173,7 +173,8 @@ static unsigned dx_get_count(struct dx_e
+ static unsigned dx_get_limit(struct dx_entry *entries);
static void dx_set_count(struct dx_entry *entries, unsigned value);
static void dx_set_limit(struct dx_entry *entries, unsigned value);
-static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
+static inline unsigned dx_root_limit(__u32 blocksize,
+ struct ext4_dir_entry_2 *dot_de, unsigned infosize);
static unsigned dx_node_limit(struct inode *dir);
static void dx_set_count(struct dx_entry *entries, unsigned value);
static void dx_set_limit(struct dx_entry *entries, unsigned value);
-static unsigned dx_root_limit(struct inode *dir, unsigned infosize);
+static inline unsigned dx_root_limit(__u32 blocksize,
+ struct ext4_dir_entry_2 *dot_de, unsigned infosize);
static unsigned dx_node_limit(struct inode *dir);
- static struct dx_frame *dx_probe(struct dentry *dentry,
+ static struct dx_frame *dx_probe(const struct qstr *d_name,
-@@ -218,11 +219,12 @@ ext4_next_entry(struct ext4_dir_entry_2
+@@ -216,11 +217,12 @@ ext4_next_entry(struct ext4_dir_entry_2
*/
struct dx_root_info * dx_get_dx_info(struct ext4_dir_entry_2 *de)
{
*/
struct dx_root_info * dx_get_dx_info(struct ext4_dir_entry_2 *de)
{
return (struct dx_root_info *) de;
}
return (struct dx_root_info *) de;
}
-@@ -267,16 +269,23 @@ static inline void dx_set_limit (struct
+@@ -265,16 +267,23 @@ static inline void dx_set_limit(struct d
((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
}
((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
}
return entry_space / sizeof(struct dx_entry);
}
return entry_space / sizeof(struct dx_entry);
}
-@@ -323,7 +332,7 @@ static struct stats dx_show_leaf(struct
+@@ -321,7 +330,7 @@ static struct stats dx_show_leaf(struct
printk(":%x.%u ", h.hash,
((char *) de - base));
}
printk(":%x.%u ", h.hash,
((char *) de - base));
}
+ space += EXT4_DIR_REC_LEN(de);
names++;
}
+ space += EXT4_DIR_REC_LEN(de);
names++;
}
- de = ext4_next_entry(de);
-@@ -427,7 +436,8 @@ dx_probe(struct dentry *dentry, struct i
+ de = ext4_next_entry(de, size);
+@@ -424,7 +433,8 @@ dx_probe(const struct qstr *d_name, stru
entries = (struct dx_entry *) (((char *)info) + info->info_length);
entries = (struct dx_entry *) (((char *)info) + info->info_length);
+ if (dx_get_limit(entries) != dx_root_limit(dir->i_sb->s_blocksize,
+ (struct ext4_dir_entry_2*)bh->b_data,
info->info_length)) {
+ if (dx_get_limit(entries) != dx_root_limit(dir->i_sb->s_blocksize,
+ (struct ext4_dir_entry_2*)bh->b_data,
info->info_length)) {
- ext4_warning(dir->i_sb, __func__,
- "dx entry: limit != root limit");
-@@ -485,14 +495,17 @@ dx_probe(const struct qstr *d_name, stru
+ ext4_warning(dir->i_sb, "dx entry: limit != root limit");
+ brelse(bh);
+@@ -480,14 +490,17 @@ dx_probe(const struct qstr *d_name, stru
if (!indirect--) return frame;
if (!(bh = ext4_bread (NULL,dir, dx_get_block(at), 0, err)))
goto fail2;
if (!indirect--) return frame;
if (!(bh = ext4_bread (NULL,dir, dx_get_block(at), 0, err)))
goto fail2;
frame++;
frame->bh = NULL;
}
frame++;
frame->bh = NULL;
}
-@@ -618,7 +631,7 @@ static int htree_dirblock_to_tree(struct
+@@ -613,7 +626,7 @@ static int htree_dirblock_to_tree(struct
de = (struct ext4_dir_entry_2 *) bh->b_data;
top = (struct ext4_dir_entry_2 *) ((char *) de +
dir->i_sb->s_blocksize -
- EXT4_DIR_REC_LEN(0));
+ __EXT4_DIR_REC_LEN(0));
de = (struct ext4_dir_entry_2 *) bh->b_data;
top = (struct ext4_dir_entry_2 *) ((char *) de +
dir->i_sb->s_blocksize -
- EXT4_DIR_REC_LEN(0));
+ __EXT4_DIR_REC_LEN(0));
- for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
+ for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {
if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
(block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))
if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,
(block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))
-@@ -1026,7 +1036,7 @@ static struct buffer_head * ext4_dx_find
+@@ -1025,7 +1038,7 @@ static struct buffer_head * ext4_dx_find
goto errout;
de = (struct ext4_dir_entry_2 *) bh->b_data;
top = (struct ext4_dir_entry_2 *) ((char *) de + sb->s_blocksize -
- EXT4_DIR_REC_LEN(0));
+ __EXT4_DIR_REC_LEN(0));
goto errout;
de = (struct ext4_dir_entry_2 *) bh->b_data;
top = (struct ext4_dir_entry_2 *) ((char *) de + sb->s_blocksize -
- EXT4_DIR_REC_LEN(0));
+ __EXT4_DIR_REC_LEN(0));
- for (; de < top; de = ext4_next_entry(de, sb->s_blocksize)) {
+ for (; de < top; de = ext4_next_entry(de, sb->s_blocksize)) {
int off = (block << EXT4_BLOCK_SIZE_BITS(sb))
+ ((char *) de - bh->b_data);
int off = (block << EXT4_BLOCK_SIZE_BITS(sb))
+ ((char *) de - bh->b_data);
-@@ -1193,7 +1203,7 @@ dx_move_dirents(char *from, char *to, st
+@@ -1186,7 +1199,7 @@ dx_move_dirents(char *from, char *to, st
- struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
- (from + (map->offs<<2));
+ struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *)
+ (from + (map->offs<<2));
- rec_len = EXT4_DIR_REC_LEN(de->name_len);
+ rec_len = EXT4_DIR_REC_LEN(de);
memcpy (to, de, rec_len);
((struct ext4_dir_entry_2 *) to)->rec_len =
- rec_len = EXT4_DIR_REC_LEN(de->name_len);
+ rec_len = EXT4_DIR_REC_LEN(de);
memcpy (to, de, rec_len);
((struct ext4_dir_entry_2 *) to)->rec_len =
- ext4_rec_len_to_disk(rec_len);
-@@ -1217,7 +1227,7 @@ static struct ext4_dir_entry_2* dx_pack_
- while ((char*)de < base + size) {
- next = ext4_next_entry(de);
+ ext4_rec_len_to_disk(rec_len, blocksize);
+@@ -1210,7 +1223,7 @@ static struct ext4_dir_entry_2* dx_pack_
+ while ((char*)de < base + blocksize) {
+ next = ext4_next_entry(de, blocksize);
if (de->inode && de->name_len) {
- rec_len = EXT4_DIR_REC_LEN(de->name_len);
+ rec_len = EXT4_DIR_REC_LEN(de);
if (de > to)
memmove(to, de, rec_len);
if (de->inode && de->name_len) {
- rec_len = EXT4_DIR_REC_LEN(de->name_len);
+ rec_len = EXT4_DIR_REC_LEN(de);
if (de > to)
memmove(to, de, rec_len);
- to->rec_len = ext4_rec_len_to_disk(rec_len);
-@@ -1347,10 +1357,16 @@ static int add_dirent_to_buf(handle_t *h
- int namelen = dentry->d_name.len;
- unsigned long offset = 0;
+ to->rec_len = ext4_rec_len_to_disk(rec_len, blocksize);
+@@ -1340,10 +1353,16 @@ static int add_dirent_to_buf(handle_t *h
+ unsigned int offset = 0;
+ unsigned int blocksize = dir->i_sb->s_blocksize;
unsigned short reclen;
- int nlen, rlen, err;
+ int nlen, rlen, err, dlen = 0;
unsigned short reclen;
- int nlen, rlen, err;
+ int nlen, rlen, err, dlen = 0;
+ reclen = __EXT4_DIR_REC_LEN(namelen + dlen);
if (!de) {
de = (struct ext4_dir_entry_2 *)bh->b_data;
+ reclen = __EXT4_DIR_REC_LEN(namelen + dlen);
if (!de) {
de = (struct ext4_dir_entry_2 *)bh->b_data;
- top = bh->b_data + dir->i_sb->s_blocksize - reclen;
-@@ -1364,7 +1380,7 @@ static int add_dirent_to_buf(handle_t *h
- return -EIO;
- if (ext4_match(namelen, name, de))
- return -EEXIST;
+ top = bh->b_data + blocksize - reclen;
+@@ -1353,7 +1372,7 @@ static int add_dirent_to_buf(handle_t *h
+ return -EIO;
+ if (ext4_match(namelen, name, de))
+ return -EEXIST;
- nlen = EXT4_DIR_REC_LEN(de->name_len);
+ nlen = EXT4_DIR_REC_LEN(de);
- nlen = EXT4_DIR_REC_LEN(de->name_len);
+ nlen = EXT4_DIR_REC_LEN(de);
- rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
+ rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
if ((de->inode? rlen - nlen: rlen) >= reclen)
break;
if ((de->inode? rlen - nlen: rlen) >= reclen)
break;
-@@ -1383,7 +1399,7 @@ static int add_dirent_to_buf(handle_t *h
+@@ -1371,7 +1390,7 @@ static int add_dirent_to_buf(handle_t *h
}
/* By now the buffer is marked for journaling */
- nlen = EXT4_DIR_REC_LEN(de->name_len);
+ nlen = EXT4_DIR_REC_LEN(de);
}
/* By now the buffer is marked for journaling */
- nlen = EXT4_DIR_REC_LEN(de->name_len);
+ nlen = EXT4_DIR_REC_LEN(de);
- rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
+ rlen = ext4_rec_len_from_disk(de->rec_len, blocksize);
if (de->inode) {
struct ext4_dir_entry_2 *de1 = (struct ext4_dir_entry_2 *)((char *)de + nlen);
if (de->inode) {
struct ext4_dir_entry_2 *de1 = (struct ext4_dir_entry_2 *)((char *)de + nlen);
-@@ -1399,6 +1415,12 @@ static int add_dirent_to_buf(handle_t *h
+@@ -1387,6 +1406,12 @@ static int add_dirent_to_buf(handle_t *h
de->inode = 0;
de->name_len = namelen;
memcpy(de->name, name, namelen);
de->inode = 0;
de->name_len = namelen;
memcpy(de->name, name, namelen);
/*
* XXX shouldn't update any times until successful
* completion of syscall, but too many callers depend
/*
* XXX shouldn't update any times until successful
* completion of syscall, but too many callers depend
-@@ -1488,7 +1510,8 @@ static int make_indexed_dir(handle_t *ha
+@@ -1485,7 +1510,8 @@ static int make_indexed_dir(handle_t *ha
dx_set_block(entries, 1);
dx_set_count(entries, 1);
dx_set_block(entries, 1);
dx_set_count(entries, 1);
/* Initialize as for dx_probe */
hinfo.hash_version = dx_info->hash_version;
/* Initialize as for dx_probe */
hinfo.hash_version = dx_info->hash_version;
-@@ -1516,6 +1539,8 @@ static int ext4_update_dotdot(handle_t *
+@@ -1516,6 +1542,8 @@ static int ext4_update_dotdot(handle_t *
struct buffer_head * dir_block;
struct ext4_dir_entry_2 * de;
int len, journal = 0, err = 0;
struct buffer_head * dir_block;
struct ext4_dir_entry_2 * de;
int len, journal = 0, err = 0;
if (IS_ERR(handle))
return PTR_ERR(handle);
if (IS_ERR(handle))
return PTR_ERR(handle);
-@@ -1531,19 +1556,24 @@ static int ext4_update_dotdot(handle_t *
+@@ -1531,19 +1559,24 @@ static int ext4_update_dotdot(handle_t *
/* the first item must be "." */
assert(de->name_len == 1 && de->name[0] == '.');
len = le16_to_cpu(de->rec_len);
/* the first item must be "." */
assert(de->name_len == 1 && de->name[0] == '.');
len = le16_to_cpu(de->rec_len);
de = (struct ext4_dir_entry_2 *)
((char *) de + le16_to_cpu(de->rec_len));
if (!journal) {
de = (struct ext4_dir_entry_2 *)
((char *) de + le16_to_cpu(de->rec_len));
if (!journal) {
-@@ -1557,10 +1587,15 @@ static int ext4_update_dotdot(handle_t *
+@@ -1557,10 +1590,15 @@ static int ext4_update_dotdot(handle_t *
if (len > 0)
de->rec_len = cpu_to_le16(len);
else
if (len > 0)
de->rec_len = cpu_to_le16(len);
else
out_journal:
if (journal) {
out_journal:
if (journal) {
-@@ -1972,12 +2007,13 @@ retry:
+@@ -1982,12 +2020,13 @@ retry:
/* Initialize @inode as a subdirectory of @dir, and add the
* "." and ".." entries into the first directory block. */
int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir,
/* Initialize @inode as a subdirectory of @dir, and add the
* "." and ".." entries into the first directory block. */
int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir,
{
unsigned int blocksize = dir->i_sb->s_blocksize;
struct buffer_head * dir_block;
{
unsigned int blocksize = dir->i_sb->s_blocksize;
struct buffer_head * dir_block;
- struct ext4_dir_entry_2 * de;
+ struct ext4_dir_entry_2 * de;
- int err = 0;
+ int err = 0, dot_reclen;
- int err = 0;
+ int err = 0, dot_reclen;
- if (IS_ERR(handle))
- return PTR_ERR(handle);
-@@ -1993,17 +2029,34 @@ int ext4_add_dot_dotdot(handle_t *handle
+ if (IS_ERR(handle))
+ return PTR_ERR(handle);
+@@ -1999,28 +2038,42 @@ int ext4_add_dot_dotdot(handle_t *handle
+ inode->i_fop = &ext4_dir_operations;
+ inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize;
+ dir_block = ext4_bread(handle, inode, 0, 1, &err);
+- if (!dir_block) {
+- clear_nlink(inode);
+- ext4_mark_inode_dirty(handle, inode);
+- iput (inode);
++ if (!dir_block)
+ goto get_out;
+- }
++
+ BUFFER_TRACE(dir_block, "get_write_access");
+ ext4_journal_get_write_access(handle, dir_block);
de = (struct ext4_dir_entry_2 *) dir_block->b_data;
de->inode = cpu_to_le32(inode->i_ino);
de->name_len = 1;
de = (struct ext4_dir_entry_2 *) dir_block->b_data;
de->inode = cpu_to_le32(inode->i_ino);
de->name_len = 1;
+ de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
+ dot_reclen = cpu_to_le16(de->rec_len);
+
+ de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de));
+ dot_reclen = cpu_to_le16(de->rec_len);
+
- de = ext4_next_entry(de, blocksize);
+ de = ext4_next_entry(de, blocksize);
de->inode = cpu_to_le32(dir->i_ino);
- de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(1),
+ de->rec_len = ext4_rec_len_to_disk(blocksize - dot_reclen,
de->inode = cpu_to_le32(dir->i_ino);
- de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(1),
+ de->rec_len = ext4_rec_len_to_disk(blocksize - dot_reclen,
de->name_len = 2;
strcpy(de->name, "..");
ext4_set_de_type(dir->i_sb, de, S_IFDIR);
de->name_len = 2;
strcpy(de->name, "..");
ext4_set_de_type(dir->i_sb, de, S_IFDIR);
+ }
+
inode->i_nlink = 2;
+ }
+
inode->i_nlink = 2;
- BUFFER_TRACE(dir_block, "call ext4_journal_dirty_metadata");
- ext4_journal_dirty_metadata(handle, dir_block);
-@@ -2037,7 +2091,7 @@ retry:
+ BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
+ ext4_handle_dirty_metadata(handle, dir, dir_block);
+@@ -2057,9 +2110,14 @@ retry:
if (IS_ERR(inode))
goto out_stop;
- err = ext4_add_dot_dotdot(handle, dir, inode);
if (IS_ERR(inode))
goto out_stop;
- err = ext4_add_dot_dotdot(handle, dir, inode);
+ err = ext4_add_dot_dotdot(handle, dir, inode, NULL, NULL);
+ err = ext4_add_dot_dotdot(handle, dir, inode, NULL, NULL);
++ if (err) {
++ clear_nlink(inode);
++ unlock_new_inode(inode);
++ ext4_mark_inode_dirty(handle, inode);
++ iput (inode);
-@@ -2071,7 +2125,7 @@ static int empty_dir (struct inode * ino
+ err = ext4_add_entry(handle, dentry, inode);
+ if (err) {
+@@ -2093,7 +2151,7 @@ static int empty_dir(struct inode *inode
int err = 0;
sb = inode->i_sb;
int err = 0;
sb = inode->i_sb;
+ if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2) ||
!(bh = ext4_bread(NULL, inode, 0, 0, &err))) {
if (err)
+ if (inode->i_size < __EXT4_DIR_REC_LEN(1) + __EXT4_DIR_REC_LEN(2) ||
!(bh = ext4_bread(NULL, inode, 0, 0, &err))) {
if (err)
- ext4_error(inode->i_sb, __func__,
+ ext4_error(inode->i_sb,
git://git.whamcloud.com / fs / lustre-release.git / commitdiff