ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
PATCH 1/1 ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
Under some conditions, the directory cannot be deleted. The specific scenarios are as follows: (for example, /mnt/ocfs2 is the mount point)
1. Create the /mnt/ocfs2/p_dir directory. At this time, the i_nlink corresponding to the inode of
the /mnt/ocfs2/p_dir directory is equal to 2.
2. During the process of creating the/mnt/ocfs2/p_dir/s_dir directory, if the call to the inc_nlink function in ocfs2_mknod succeeds, the functions such as ocfs2_init_acl, ocfs2_init_security_set, and ocfs2_dentry_attach_lock fail. At this time, the i_nlink corresponding to the inode of the /mnt/ocfs2/p_dir directory is equal to 3, but /mnt/ocfs2/p_dir/s_dir is not added to the /mnt/ocfs2/p_dir directory entry.
3. Delete the /mnt/ocfs2/p_dir directory (rm -rf /mnt/ocfs2/p_dir). At this time, it is found that the i_nlink corresponding to the inode corresponding to the /mnt/ocfs2/p_dir directory is equal to 3. Therefore, the /mnt/ocfs2/p_dir directory cannot be deleted.
--- ocfs2/namei.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
ocfs2/namei.c +13 -11
@@ -388,17 +388,6 @@ static int ocfs2_mknod(struct inode *dir,mlog_errno (status); goto leave; } - - status =ocfs2_journal_access_di (handle,INODE_CACHE (dir), - parent_fe_bh, -OCFS2_JOURNAL_ACCESS_WRITE ); -if (status <0 ) { -mlog_errno (status); - goto leave; - } -ocfs2_add_links_count (dirfe,1 ); -ocfs2_journal_dirty (handle, parent_fe_bh); -inc_nlink (dir); } status = ocfs2_init_acl(handle, inode, dir, new_fe_bh, parent_fe_bh,
@@ -440,6 +429,19 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } +if (S_ISDIR (mode)) { + status =ocfs2_journal_access_di (handle,INODE_CACHE (dir), + parent_fe_bh, +OCFS2_JOURNAL_ACCESS_WRITE ); +if (status <0 ) { +mlog_errno (status); + goto leave; + } +ocfs2_add_links_count (dirfe,1 ); +ocfs2_journal_dirty (handle, parent_fe_bh); +inc_nlink (dir); + } +insert_inode_hash (inode);d_instantiate (dentry, inode); status =0 ;
Signature · 5 lines
1.8.3.1 -------------- next part -------------- An HTML attachment was scrubbed... URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20200316/12549b30/attachment.html
PATCH 1/1 ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
Quoted 49 lines · wangjian
Under some conditions, the directory cannot be deleted. The specific scenarios are as follows: (for example,
/mnt/ocfs2is the mount point)1. Create the
/mnt/ocfs2/p_dirdirectory. At this time, thei_nlinkcorresponding to the inode of
the/mnt/ocfs2/p_dirdirectory is equal to 2.2. During the process of creating the
/mnt/ocfs2/p_dir/s_dirdirectory, if the call to theinc_nlinkfunction inocfs2_mknodsucceeds, the functions such asocfs2_init_acl,ocfs2_init_security_set, andocfs2_dentry_attach_lockfail. At this time, thei_nlinkcorresponding to the inode of the/mnt/ocfs2/p_dirdirectory is equal to 3, but/mnt/ocfs2/p_dir/s_diris not added to the/mnt/ocfs2/p_dirdirectory entry.3. Delete the
/mnt/ocfs2/p_dirdirectory (rm -rf/mnt/ocfs2/p_dir). At this time, it is found that thei_nlinkcorresponding to the inode corresponding to the/mnt/ocfs2/p_dirdirectory is equal to 3. Therefore, the/mnt/ocfs2/p_dirdirectory cannot be deleted.Signed-off-by Jian wang <[email protected]>--- ocfs2/namei.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)ocfs2/namei.c +0
-11@@ -388,17 +388,6 @@ static int ocfs2_mknod(struct inode *dir,mlog_errno (status); goto leave; } - - status =ocfs2_journal_access_di (handle,INODE_CACHE (dir), - parent_fe_bh, -OCFS2_JOURNAL_ACCESS_WRITE ); -if (status <0 ) { -mlog_errno (status); - goto leave; - } -ocfs2_add_links_count (dirfe,1 ); -ocfs2_journal_dirty (handle, parent_fe_bh); -inc_nlink (dir); } status = ocfs2_init_acl(handle, inode, dir, new_fe_bh, parent_fe_bh,
ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 436
Quoted 8 lines
ocfs2/namei.c +5
-0@@ -440,6 +429,19 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } +if (S_ISDIR (mode)) { + status =ocfs2_journal_access_di (handle,INODE_CACHE (dir), + parent_fe_bh, +OCFS2_JOURNAL_ACCESS_WRITE ); +if (status <0 ) {
I wonder if we should rollback the inode's new_fe_bh if getting failed here?
Jun
Quoted 21 lines
ocfs2/namei.c +8
-0+mlog_errno (status); + goto leave; + } +ocfs2_add_links_count (dirfe,1 ); +ocfs2_journal_dirty (handle, parent_fe_bh); +inc_nlink (dir); + } +insert_inode_hash (inode);d_instantiate (dentry, inode); status =0 ;Signature · 8 lines
1.8.3.1 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel at oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Joseph Qi
maintainerPATCH 1/1 ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
In reply to wangjianQuoted 32 lines · wangjian
Under some conditions, the directory cannot be deleted. The specific scenarios are as follows: (for example,
/mnt/ocfs2is the mount point)1. Create the
/mnt/ocfs2/p_dirdirectory. At this time, thei_nlinkcorresponding to the inode of
the/mnt/ocfs2/p_dirdirectory is equal to 2.2. During the process of creating the
/mnt/ocfs2/p_dir/s_dirdirectory, if the call to theinc_nlinkfunction inocfs2_mknodsucceeds, the functions such asocfs2_init_acl,ocfs2_init_security_set, andocfs2_dentry_attach_lockfail. At this time, thei_nlinkcorresponding to the inode of the/mnt/ocfs2/p_dirdirectory is equal to 3, but/mnt/ocfs2/p_dir/s_diris not added to the/mnt/ocfs2/p_dirdirectory entry.3. Delete the
/mnt/ocfs2/p_dirdirectory (rm -rf/mnt/ocfs2/p_dir). At this time, it is found that thei_nlinkcorresponding to the inode corresponding to the/mnt/ocfs2/p_dirdirectory is equal to 3. Therefore, the/mnt/ocfs2/p_dirdirectory cannot be deleted.Signed-off-by Jian wang <[email protected]>---
?ocfs2/namei.c | 24 +++++++++++++----------- ?1 file changed, 13 insertions(+), 11 deletions(-)ocfs2/namei.c +0
-0@@ -388,17 +388,6 @@ static int ocfs2_mknod(struct inode *dir, ???????????? mlog_errno(status);
ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 398
Quoted 10 lines
ocfs2/namei.c +0
-8???????????? goto leave; ???????? } - -??????? status = ocfs2_journal_access_di(handle, INODE_CACHE(dir), -???????????????????????? parent_fe_bh, -???????????????????????? OCFS2_JOURNAL_ACCESS_WRITE); -??????? if (status < 0) { -??????????? mlog_errno(status); -??????????? goto leave; -??????? }
We can't simply move it down since we should get journal access before modification.
Thanks,
Joseph
Quoted 26 lines
ocfs2/namei.c +0
-3-??????? ocfs2_add_links_count(dirfe, 1); -??????? ocfs2_journal_dirty(handle, parent_fe_bh); -??????? inc_nlink(dir); ???? }?
???? status = ocfs2_init_acl(handle, inode, dir,new_fe_bh,parent_fe_bh,ocfs2/namei.c +0
-0@@ -440,6 +429,19 @@ static int ocfs2_mknod(struct inode *dir, ???????? goto leave; ???? }?
+??? if (S_ISDIR(mode)) {
+??????? status = ocfs2_journal_access_di(handle,INODE_CACHE(dir), +????????????????????????parent_fe_bh, +????????????????????????OCFS2_JOURNAL_ACCESS_WRITE); +??????? if (status < 0) {
+???????????mlog_errno(status);
+??????????? goto leave;
+??????? }
+???????ocfs2_add_links_count(dirfe, 1);
+???????ocfs2_journal_dirty(handle, parent_fe_bh); +???????inc_nlink(dir);
+??? }
+
????insert_inode_hash(inode);
????d_instantiate(dentry, inode);
???? status = 0;
PATCH 1/1 ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
good suggestion. Can we just move the three statements ocfs2_add_links_count (dirfe, 1),ocfs2_journal_dirty (handle, parent_fe_bh), inc_nlink (dir) to the following?
This seems to be no problem. Or reset the reference count back in case of failure?
Thanks,
Jian
Quoted 78 lines · Joseph Qi
Quoted 32 lines · wangjian
Under some conditions, the directory cannot be deleted. The specific scenarios are as follows: (for example,
/mnt/ocfs2is the mount point)1. Create the
/mnt/ocfs2/p_dirdirectory. At this time, thei_nlinkcorresponding to the inode of
the/mnt/ocfs2/p_dirdirectory is equal to 2.2. During the process of creating the
/mnt/ocfs2/p_dir/s_dirdirectory, if the call to theinc_nlinkfunction inocfs2_mknodsucceeds, the functions such asocfs2_init_acl,ocfs2_init_security_set, andocfs2_dentry_attach_lockfail. At this time, thei_nlinkcorresponding to the inode of the/mnt/ocfs2/p_dirdirectory is equal to 3, but/mnt/ocfs2/p_dir/s_diris not added to the/mnt/ocfs2/p_dirdirectory entry.3. Delete the
/mnt/ocfs2/p_dirdirectory (rm -rf/mnt/ocfs2/p_dir). At this time, it is found that thei_nlinkcorresponding to the inode corresponding to the/mnt/ocfs2/p_dirdirectory is equal to 3. Therefore, the/mnt/ocfs2/p_dirdirectory cannot be deleted.Signed-off-by Jian wang <[email protected]>--- ?ocfs2/namei.c | 24 +++++++++++++-----------?1 file changed, 13 insertions(+), 11 deletions(-)
ocfs2/namei.c +0
-0@@ -388,17 +388,6 @@ static int ocfs2_mknod(struct inode *dir, ???????????? mlog_errno(status);ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 398
Quoted 10 lines
ocfs2/namei.c +0
-8???????????? goto leave; ???????? } - -??????? status = ocfs2_journal_access_di(handle, INODE_CACHE(dir), -???????????????????????? parent_fe_bh, -???????????????????????? OCFS2_JOURNAL_ACCESS_WRITE); -??????? if (status < 0) { -??????????? mlog_errno(status); -??????????? goto leave; -??????? }We can't simply move it down since we should get journal access before modification.
Thanks,
JosephQuoted 16 lines
ocfs2/namei.c +6
-3-??????? ocfs2_add_links_count(dirfe, 1); -??????? ocfs2_journal_dirty(handle, parent_fe_bh); -??????? inc_nlink(dir); ???? } ???? status = ocfs2_init_acl(handle, inode, dir, new_fe_bh, parent_fe_bh,@@ -440,6 +429,19 @@ static int ocfs2_mknod(struct inode *dir, ???????? goto leave; ???? } +??? if (S_ISDIR(mode)) { +??????? status = ocfs2_journal_access_di(handle, INODE_CACHE(dir), +???????????????????????? parent_fe_bh, +???????????????????????? OCFS2_JOURNAL_ACCESS_WRITE); +??????? if (status < 0) { +??????????? mlog_errno(status);ocfs2/namei.c static int ocfs2_mknod(struct inode *dir, · line 447
Quoted 10 lines
ocfs2/namei.c +7
-0+??????????? goto leave; +??????? } +??????? ocfs2_add_links_count(dirfe, 1); +??????? ocfs2_journal_dirty(handle, parent_fe_bh); +??????? inc_nlink(dir); +??? } + ???? insert_inode_hash(inode); ???? d_instantiate(dentry, inode); ???? status = 0;.
Joseph Qi
maintainerPATCH 1/1 ocfs2: the parent directory reference count should be increased only after the ocfs2_add_entry function is successfully called
Quoted 4 lines · wangjian
good suggestion. Can we just move the three statements
ocfs2_add_links_count(dirfe, 1),ocfs2_journal_dirty(handle,parent_fe_bh),inc_nlink(dir) to the following? This seems to be no problem. Or reset the reference count back in case of failure?
IMO, rollback the link modification in error handling may be a better choice.
Thanks,
Joseph