diff options
author | Jan Kara <jack@suse.cz> | 2014-04-03 17:46:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 19:20:54 -0400 |
commit | 7bf619c1425d5f03e33c744921f6251f4d0d745f (patch) | |
tree | 4c46eef12b072fb296d9d080acfe2826f90389c4 /fs/ocfs2/inode.h | |
parent | 765aabbbc72923bdb9116e49b1fc27ef22c6e65a (diff) |
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>
Diffstat (limited to 'fs/ocfs2/inode.h')
-rw-r--r-- | fs/ocfs2/inode.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h index 837e5e42af85..a6c991c0fc98 100644 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h | |||
@@ -91,8 +91,6 @@ struct ocfs2_inode_info | |||
91 | #define OCFS2_INODE_BITMAP 0x00000004 | 91 | #define OCFS2_INODE_BITMAP 0x00000004 |
92 | /* This inode has been wiped from disk */ | 92 | /* This inode has been wiped from disk */ |
93 | #define OCFS2_INODE_DELETED 0x00000008 | 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 | /* Has the inode been orphaned on another node? | 94 | /* Has the inode been orphaned on another node? |
97 | * | 95 | * |
98 | * This hints to ocfs2_drop_inode that it should clear i_nlink before | 96 | * This hints to ocfs2_drop_inode that it should clear i_nlink before |
@@ -107,11 +105,11 @@ struct ocfs2_inode_info | |||
107 | * rely on ocfs2_delete_inode to sort things out under the proper | 105 | * rely on ocfs2_delete_inode to sort things out under the proper |
108 | * cluster locks. | 106 | * cluster locks. |
109 | */ | 107 | */ |
110 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000020 | 108 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000010 |
111 | /* Does someone have the file open O_DIRECT */ | 109 | /* Does someone have the file open O_DIRECT */ |
112 | #define OCFS2_INODE_OPEN_DIRECT 0x00000040 | 110 | #define OCFS2_INODE_OPEN_DIRECT 0x00000020 |
113 | /* Tell the inode wipe code it's not in orphan dir */ | 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 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) | 114 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) |
117 | { | 115 | { |