Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf619c1 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

ocfs2: remove OCFS2_INODE_SKIP_DELETE flag 



The flag was never set, delete it.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
Reviewed-by: default avatarSrinivas Eeda <srinivas.eeda@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 765aabbb

fs/ocfs2/inode.c

+0 −6
Original line number Diff line number Diff line
@@ -849,12 +849,6 @@ static int ocfs2_inode_is_valid_to_delete(struct inode *inode) 
		goto bail_unlock;

	}



	/* If we have allowd wipe of this inode for another node, it

	 * will be marked here so we can safely skip it. Recovery will

	 * cleanup any inodes we might inadvertently skip here. */

	if (oi->ip_flags & OCFS2_INODE_SKIP_DELETE)

		goto bail_unlock;



	ret = 1;

bail_unlock:

	spin_unlock(&oi->ip_lock);

fs/ocfs2/inode.h

+3 −5
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ struct ocfs2_inode_info 
#define OCFS2_INODE_BITMAP		0x00000004

/* This inode has been wiped from disk */

#define OCFS2_INODE_DELETED		0x00000008

/* Another node is deleting, so our delete is a nop */

#define OCFS2_INODE_SKIP_DELETE		0x00000010

/* Has the inode been orphaned on another node?

 *

 * This hints to ocfs2_drop_inode that it should clear i_nlink before
@@ -107,11 +105,11 @@ struct ocfs2_inode_info 
 * rely on ocfs2_delete_inode to sort things out under the proper

 * cluster locks.

 */

#define OCFS2_INODE_MAYBE_ORPHANED	0x00000020

#define OCFS2_INODE_MAYBE_ORPHANED	0x00000010

/* Does someone have the file open O_DIRECT */

#define OCFS2_INODE_OPEN_DIRECT		0x00000040

#define OCFS2_INODE_OPEN_DIRECT		0x00000020

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

#define OCFS2_INODE_SKIP_ORPHAN_DIR     0x00000080

#define OCFS2_INODE_SKIP_ORPHAN_DIR     0x00000040



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

{

fs/ocfs2/journal.c

+0 −6
Original line number Diff line number Diff line
@@ -2132,12 +2132,6 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb, 
		iter = oi->ip_next_orphan;



		spin_lock(&oi->ip_lock);

		/* The remote delete code may have set these on the

		 * assumption that the other node would wipe them

		 * successfully.  If they are still in the node's

		 * orphan dir, we need to reset that state. */

		oi->ip_flags &= ~(OCFS2_INODE_DELETED|OCFS2_INODE_SKIP_DELETE);



		/* Set the proper information to get us going into

		 * ocfs2_delete_inode. */

		oi->ip_flags |= OCFS2_INODE_MAYBE_ORPHANED;