github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ocfs2: take ip_alloc_sem in ocfs2_dio_get_block & ocfs2_dio_end_io_write

Browse Source 
Take ip_alloc_sem to prevent concurrent access to extent tree, which may
cause the extent tree in an unstable state.

Signed-off-by: Ryan Ding <ryan.ding@oracle.com>
Reviewed-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ryan Ding 2016-03-25 14:21:18 -07:00 committed by Linus Torvalds
parent e63890f38a
commit a86a72a4a4
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/ocfs2/aops.c
View File

@ -2151,6 +2151,7 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
struct buffer_head *bh_result, int create) struct buffer_head *bh_result, int create)
{ {
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_inode_info *oi = OCFS2_I(inode);
struct ocfs2_write_ctxt *wc; struct ocfs2_write_ctxt *wc;
struct ocfs2_write_cluster_desc *desc = NULL; struct ocfs2_write_cluster_desc *desc = NULL;
struct ocfs2_dio_write_ctxt *dwc = NULL; struct ocfs2_dio_write_ctxt *dwc = NULL;
@ -2166,9 +2167,12 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
mlog(0, "get block of %lu at %llu:%u req %u\n", mlog(0, "get block of %lu at %llu:%u req %u\n",
inode->i_ino, pos, len, total_len); inode->i_ino, pos, len, total_len);
down_read(&oi->ip_alloc_sem);
/* This is the fast path for re-write. */ /* This is the fast path for re-write. */
ret = ocfs2_get_block(inode, iblock, bh_result, create); ret = ocfs2_get_block(inode, iblock, bh_result, create);
up_read(&oi->ip_alloc_sem);
if (buffer_mapped(bh_result) && if (buffer_mapped(bh_result) &&
!buffer_new(bh_result) && !buffer_new(bh_result) &&
ret == 0) ret == 0)
@ -2206,6 +2210,8 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
goto out; goto out;
} }
down_write(&oi->ip_alloc_sem);
if (first_get_block) { if (first_get_block) {
if (ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb))) if (ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)))
ret = ocfs2_zero_tail(inode, di_bh, pos); ret = ocfs2_zero_tail(inode, di_bh, pos);
@ -2259,6 +2265,7 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
BUG_ON(ret != len); BUG_ON(ret != len);
ret = 0; ret = 0;
unlock: unlock:
up_write(&oi->ip_alloc_sem);
ocfs2_inode_unlock(inode, 1); ocfs2_inode_unlock(inode, 1);
brelse(di_bh); brelse(di_bh);
out: out:
@ -2275,6 +2282,7 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
struct ocfs2_cached_dealloc_ctxt dealloc; struct ocfs2_cached_dealloc_ctxt dealloc;
struct ocfs2_extent_tree et; struct ocfs2_extent_tree et;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct ocfs2_inode_info *oi = OCFS2_I(inode);
struct ocfs2_unwritten_extent *ue = NULL; struct ocfs2_unwritten_extent *ue = NULL;
struct buffer_head *di_bh = NULL; struct buffer_head *di_bh = NULL;
struct ocfs2_dinode *di; struct ocfs2_dinode *di;
@ -2293,12 +2301,6 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
!dwc->dw_orphaned) !dwc->dw_orphaned)
goto out; goto out;
ret = ocfs2_inode_lock(inode, &di_bh, 1);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
/* ocfs2_file_write_iter will get i_mutex, so we need not lock if we /* ocfs2_file_write_iter will get i_mutex, so we need not lock if we
* are in that context. */ * are in that context. */
if (dwc->dw_writer_pid != task_pid_nr(current)) { if (dwc->dw_writer_pid != task_pid_nr(current)) {
@ -2306,6 +2308,14 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
locked = 1; locked = 1;
} }
ret = ocfs2_inode_lock(inode, &di_bh, 1);
if (ret < 0) {
mlog_errno(ret);
goto out;
}
down_write(&oi->ip_alloc_sem);
/* Delete orphan before acquire i_mutex. */ /* Delete orphan before acquire i_mutex. */
if (dwc->dw_orphaned) { if (dwc->dw_orphaned) {
BUG_ON(dwc->dw_writer_pid != task_pid_nr(current)); BUG_ON(dwc->dw_writer_pid != task_pid_nr(current));
@ -2359,6 +2369,7 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
commit: commit:
ocfs2_commit_trans(osb, handle); ocfs2_commit_trans(osb, handle);
unlock: unlock:
up_write(&oi->ip_alloc_sem);
ocfs2_inode_unlock(inode, 1); ocfs2_inode_unlock(inode, 1);
brelse(di_bh); brelse(di_bh);
out: out: