Commit d4cd1871 authored by Li Dongyang's avatar Li Dongyang Committed by Mark Fasheh
Browse files

ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe code 



Currently in the error path of ocfs2_symlink and ocfs2_mknod, we just call
iput with the inode we failed with, but the inode wipe code will complain
because we don't add the inode to orphan dir. One solution would be to lock
the orphan dir during the entire transaction, but that's too heavy for a
rare error path. Instead, we add a flag, OCFS2_INODE_SKIP_ORPHAN_DIR which
tells the inode wipe code that it won't find this inode in the orphan dir.

[ Merge fixes and comment style cleanups -Mark ]

Signed-off-by: default avatarLi Dongyang <lidongyang@novell.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent d5a30458

fs/ocfs2/inode.c

+36 −29
Original line number Diff line number Diff line
@@ -639,12 +639,14 @@ static int ocfs2_remove_inode(struct inode *inode, 
		goto bail_unlock;

	}



	if (!(OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) {

		status = ocfs2_orphan_del(osb, handle, orphan_dir_inode, inode,

					  orphan_dir_bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail_commit;

		}

	}



	/* set the inodes dtime */

	status = ocfs2_journal_access_di(handle, INODE_CACHE(inode), di_bh,
@@ -726,9 +728,9 @@ static int ocfs2_wipe_inode(struct inode *inode, 
	struct inode *orphan_dir_inode = NULL;

	struct buffer_head *orphan_dir_bh = NULL;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	struct ocfs2_dinode *di;

	struct ocfs2_dinode *di = (struct ocfs2_dinode *) di_bh->b_data;



	di = (struct ocfs2_dinode *) di_bh->b_data;

	if (!(OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) {

		orphaned_slot = le16_to_cpu(di->i_orphaned_slot);



		status = ocfs2_check_orphan_recovery_state(osb, orphaned_slot);
@@ -755,6 +757,7 @@ static int ocfs2_wipe_inode(struct inode *inode, 
			mlog_errno(status);

			goto bail;

		}

	}



	/* we do this while holding the orphan dir lock because we

	 * don't want recovery being run from another node to try an
@@ -794,6 +797,9 @@ static int ocfs2_wipe_inode(struct inode *inode, 
		mlog_errno(status);



bail_unlock_dir:

	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)

		return status;



	ocfs2_inode_unlock(orphan_dir_inode, 1);

	mutex_unlock(&orphan_dir_inode->i_mutex);

	brelse(orphan_dir_bh);
@@ -889,7 +895,8 @@ static int ocfs2_query_inode_wipe(struct inode *inode, 


	/* Do some basic inode verification... */

	di = (struct ocfs2_dinode *) di_bh->b_data;

	if (!(di->i_flags & cpu_to_le32(OCFS2_ORPHANED_FL))) {

	if (!(di->i_flags & cpu_to_le32(OCFS2_ORPHANED_FL)) &&

	    !(oi->ip_flags & OCFS2_INODE_SKIP_ORPHAN_DIR)) {

		/*

		 * Inodes in the orphan dir must have ORPHANED_FL.  The only

		 * inodes that come back out of the orphan dir are reflink

fs/ocfs2/inode.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ struct ocfs2_inode_info 
#define OCFS2_INODE_MAYBE_ORPHANED	0x00000020

/* Does someone have the file open O_DIRECT */

#define OCFS2_INODE_OPEN_DIRECT		0x00000040

/* Tell the inode wipe code it's not in orphan dir */

#define OCFS2_INODE_SKIP_ORPHAN_DIR     0x00000080



static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode)

{

fs/ocfs2/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -1976,6 +1976,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, 
	}



	le32_add_cpu(&fe->i_flags, OCFS2_ORPHANED_FL);

	OCFS2_I(inode)->ip_flags &= ~OCFS2_INODE_SKIP_ORPHAN_DIR;



	/* Record which orphan dir our inode now resides

	 * in. delete_inode will use this to determine which orphan

CRA Git | Maintained and supported by SUSTech CRA and CCSE