summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/namei.h
diff options
context:
space:
mode:
authorJoseph Qi <joseph.qi@huawei.com>2015-06-24 16:54:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-24 17:49:39 -0700
commitcf1776a9e834400ed8e2fea48ffa6daa9da28446 (patch)
treeb1612f8a870a1305cf32cc339119a68635091e6e /fs/ocfs2/namei.h
parente327284abb8aee3206cef3b790a283fea213a174 (diff)
downloadlinux-stable-cf1776a9e834400ed8e2fea48ffa6daa9da28446.tar.gz
linux-stable-cf1776a9e834400ed8e2fea48ffa6daa9da28446.tar.bz2
linux-stable-cf1776a9e834400ed8e2fea48ffa6daa9da28446.zip
ocfs2: fix a tiny race when truncate dio orohaned entry
Once dio crashed it will leave an entry in orphan dir. And orphan scan will take care of the clean up. There is a tiny race case that the same entry will be truncated twice and then trigger the BUG in ocfs2_del_inode_from_orphan. Signed-off-by: Joseph Qi <joseph.qi@huawei.com> Cc: Mark Fasheh <mfasheh@suse.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/namei.h')
-rw-r--r--fs/ocfs2/namei.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/namei.h b/fs/ocfs2/namei.h
index 5ddecce172fa..e173329eb830 100644
--- a/fs/ocfs2/namei.h
+++ b/fs/ocfs2/namei.h
@@ -42,8 +42,8 @@ int ocfs2_create_inode_in_orphan(struct inode *dir,
int ocfs2_add_inode_to_orphan(struct ocfs2_super *osb,
struct inode *inode);
int ocfs2_del_inode_from_orphan(struct ocfs2_super *osb,
- struct inode *inode, int update_isize,
- loff_t end);
+ struct inode *inode, struct buffer_head *di_bh,
+ int update_isize, loff_t end);
int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
struct inode *new_inode,
struct dentry *new_dentry);