提交 4fe370af 编写于 作者: M Mark Fasheh 提交者: Joel Becker

ocfs2: use allocation reservations during file write

Add a per-inode reservations structure and pass it through to the
reservations code.
Signed-off-by: NMark Fasheh <mfasheh@suse.com>
上级 d02f00cc
...@@ -7211,6 +7211,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, ...@@ -7211,6 +7211,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
goto out_commit; goto out_commit;
did_quota = 1; did_quota = 1;
data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off, ret = ocfs2_claim_clusters(osb, handle, data_ac, 1, &bit_off,
&num); &num);
if (ret) { if (ret) {
......
...@@ -1735,6 +1735,9 @@ int ocfs2_write_begin_nolock(struct address_space *mapping, ...@@ -1735,6 +1735,9 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,
goto out; goto out;
} }
if (data_ac)
data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
credits = ocfs2_calc_extend_credits(inode->i_sb, credits = ocfs2_calc_extend_credits(inode->i_sb,
&di->id2.i_list, &di->id2.i_list,
clusters_to_alloc); clusters_to_alloc);
......
...@@ -483,6 +483,9 @@ static int ocfs2_truncate_file(struct inode *inode, ...@@ -483,6 +483,9 @@ static int ocfs2_truncate_file(struct inode *inode,
down_write(&OCFS2_I(inode)->ip_alloc_sem); down_write(&OCFS2_I(inode)->ip_alloc_sem);
ocfs2_resv_discard(&osb->osb_la_resmap,
&OCFS2_I(inode)->ip_la_data_resv);
/* /*
* The inode lock forced other nodes to sync and drop their * The inode lock forced other nodes to sync and drop their
* pages, which (correctly) happens even if we have a truncate * pages, which (correctly) happens even if we have a truncate
......
...@@ -1096,6 +1096,10 @@ void ocfs2_clear_inode(struct inode *inode) ...@@ -1096,6 +1096,10 @@ void ocfs2_clear_inode(struct inode *inode)
ocfs2_mark_lockres_freeing(&oi->ip_inode_lockres); ocfs2_mark_lockres_freeing(&oi->ip_inode_lockres);
ocfs2_mark_lockres_freeing(&oi->ip_open_lockres); ocfs2_mark_lockres_freeing(&oi->ip_open_lockres);
ocfs2_resv_discard(&OCFS2_SB(inode->i_sb)->osb_la_resmap,
&oi->ip_la_data_resv);
ocfs2_resv_init_once(&oi->ip_la_data_resv);
/* We very well may get a clear_inode before all an inodes /* We very well may get a clear_inode before all an inodes
* metadata has hit disk. Of course, we can't drop any cluster * metadata has hit disk. Of course, we can't drop any cluster
* locks until the journal has finished with it. The only * locks until the journal has finished with it. The only
......
...@@ -70,6 +70,8 @@ struct ocfs2_inode_info ...@@ -70,6 +70,8 @@ struct ocfs2_inode_info
/* Only valid if the inode is the dir. */ /* Only valid if the inode is the dir. */
u32 ip_last_used_slot; u32 ip_last_used_slot;
u64 ip_last_used_group; u64 ip_last_used_group;
struct ocfs2_alloc_reservation ip_la_data_resv;
}; };
/* /*
......
...@@ -1707,6 +1707,8 @@ static void ocfs2_inode_init_once(void *data) ...@@ -1707,6 +1707,8 @@ static void ocfs2_inode_init_once(void *data)
oi->ip_blkno = 0ULL; oi->ip_blkno = 0ULL;
oi->ip_clusters = 0; oi->ip_clusters = 0;
ocfs2_resv_init_once(&oi->ip_la_data_resv);
ocfs2_lock_res_init_once(&oi->ip_rw_lockres); ocfs2_lock_res_init_once(&oi->ip_rw_lockres);
ocfs2_lock_res_init_once(&oi->ip_inode_lockres); ocfs2_lock_res_init_once(&oi->ip_inode_lockres);
ocfs2_lock_res_init_once(&oi->ip_open_lockres); ocfs2_lock_res_init_once(&oi->ip_open_lockres);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册