mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error path
Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod, so we can kill the inode in case of error. [ Fixed up comment style -Mark ] Signed-off-by: Li Dongyang <lidongyang@novell.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
ab41fdc8fd
commit
062d340384
@ -445,11 +445,6 @@ leave:
|
||||
|
||||
ocfs2_free_dir_lookup_result(&lookup);
|
||||
|
||||
if ((status < 0) && inode) {
|
||||
clear_nlink(inode);
|
||||
iput(inode);
|
||||
}
|
||||
|
||||
if (inode_ac)
|
||||
ocfs2_free_alloc_context(inode_ac);
|
||||
|
||||
@ -459,6 +454,17 @@ leave:
|
||||
if (meta_ac)
|
||||
ocfs2_free_alloc_context(meta_ac);
|
||||
|
||||
/*
|
||||
* We should call iput after the i_mutex of the bitmap been
|
||||
* unlocked in ocfs2_free_alloc_context, or the
|
||||
* ocfs2_delete_inode will mutex_lock again.
|
||||
*/
|
||||
if ((status < 0) && inode) {
|
||||
OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SKIP_ORPHAN_DIR;
|
||||
clear_nlink(inode);
|
||||
iput(inode);
|
||||
}
|
||||
|
||||
mlog_exit(status);
|
||||
|
||||
return status;
|
||||
|
Loading…
Reference in New Issue
Block a user