Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7bf619c1425d5f03e33c744921f6251f4d0d745f

Authored by Jan Kara
Committed by Linus Torvalds
1 parent 765aabbbc7
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ocfs2: remove OCFS2_INODE_SKIP_DELETE flag 

The flag was never set, delete it.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 3 additions and 17 deletions Side-by-side Diff

... ... @@ -849,12 +849,6 @@
849 849 goto bail_unlock;
850 850 }
851 851  
852   - /* If we have allowd wipe of this inode for another node, it
853   - * will be marked here so we can safely skip it. Recovery will
854   - * cleanup any inodes we might inadvertently skip here. */
855   - if (oi->ip_flags & OCFS2_INODE_SKIP_DELETE)
856   - goto bail_unlock;
857   -
858 852 ret = 1;
859 853 bail_unlock:
860 854 spin_unlock(&oi->ip_lock);
... ... @@ -91,8 +91,6 @@
91 91 #define OCFS2_INODE_BITMAP 0x00000004
92 92 /* This inode has been wiped from disk */
93 93 #define OCFS2_INODE_DELETED 0x00000008
94   -/* Another node is deleting, so our delete is a nop */
95   -#define OCFS2_INODE_SKIP_DELETE 0x00000010
96 94 /* Has the inode been orphaned on another node?
97 95 *
98 96 * This hints to ocfs2_drop_inode that it should clear i_nlink before
99 97  
100 98  
... ... @@ -107,11 +105,11 @@
107 105 * rely on ocfs2_delete_inode to sort things out under the proper
108 106 * cluster locks.
109 107 */
110   -#define OCFS2_INODE_MAYBE_ORPHANED 0x00000020
  108 +#define OCFS2_INODE_MAYBE_ORPHANED 0x00000010
111 109 /* Does someone have the file open O_DIRECT */
112   -#define OCFS2_INODE_OPEN_DIRECT 0x00000040
  110 +#define OCFS2_INODE_OPEN_DIRECT 0x00000020
113 111 /* Tell the inode wipe code it's not in orphan dir */
114   -#define OCFS2_INODE_SKIP_ORPHAN_DIR 0x00000080
  112 +#define OCFS2_INODE_SKIP_ORPHAN_DIR 0x00000040
115 113  
116 114 static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode)
117 115 {
... ... @@ -2132,12 +2132,6 @@
2132 2132 iter = oi->ip_next_orphan;
2133 2133  
2134 2134 spin_lock(&oi->ip_lock);
2135   - /* The remote delete code may have set these on the
2136   - * assumption that the other node would wipe them
2137   - * successfully. If they are still in the node's
2138   - * orphan dir, we need to reset that state. */
2139   - oi->ip_flags &= ~(OCFS2_INODE_DELETED|OCFS2_INODE_SKIP_DELETE);
2140   -
2141 2135 /* Set the proper information to get us going into
2142 2136 * ocfs2_delete_inode. */
2143 2137 oi->ip_flags |= OCFS2_INODE_MAYBE_ORPHANED;