提交 480214d7 编写于 作者: S Sunil Mushran 提交者: Mark Fasheh

ocfs2: Fix rename/extend race

If one process is extending a file while another is renaming it, there
exists a window when rename could flush the old inode's stale i_size to
disk. This patch recognizes the fact that rename is only updating the old
inode's ctime, so it ensures only that value is flushed to disk.
Signed-off-by: NSunil Mushran <sunil.musran@oracle.com>
Signed-off-by: NMark Fasheh <mark.fasheh@oracle.com>
上级 6a18380e
...@@ -1080,6 +1080,7 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1080,6 +1080,7 @@ static int ocfs2_rename(struct inode *old_dir,
struct buffer_head *old_inode_de_bh = NULL; // if old_dentry is a dir, struct buffer_head *old_inode_de_bh = NULL; // if old_dentry is a dir,
// this is the 1st dirent bh // this is the 1st dirent bh
nlink_t old_dir_nlink = old_dir->i_nlink; nlink_t old_dir_nlink = old_dir->i_nlink;
struct ocfs2_dinode *old_di;
/* At some point it might be nice to break this function up a /* At some point it might be nice to break this function up a
* bit. */ * bit. */
...@@ -1354,7 +1355,20 @@ static int ocfs2_rename(struct inode *old_dir, ...@@ -1354,7 +1355,20 @@ static int ocfs2_rename(struct inode *old_dir,
old_inode->i_ctime = CURRENT_TIME; old_inode->i_ctime = CURRENT_TIME;
mark_inode_dirty(old_inode); mark_inode_dirty(old_inode);
ocfs2_mark_inode_dirty(handle, old_inode, old_inode_bh);
status = ocfs2_journal_access(handle, old_inode, old_inode_bh,
OCFS2_JOURNAL_ACCESS_WRITE);
if (status >= 0) {
old_di = (struct ocfs2_dinode *) old_inode_bh->b_data;
old_di->i_ctime = cpu_to_le64(old_inode->i_ctime.tv_sec);
old_di->i_ctime_nsec = cpu_to_le32(old_inode->i_ctime.tv_nsec);
status = ocfs2_journal_dirty(handle, old_inode_bh);
if (status < 0)
mlog_errno(status);
} else
mlog_errno(status);
/* now that the name has been added to new_dir, remove the old name */ /* now that the name has been added to new_dir, remove the old name */
status = ocfs2_delete_entry(handle, old_dir, old_de, old_de_bh); status = ocfs2_delete_entry(handle, old_dir, old_de, old_de_bh);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册