[PATCH] ufs: ubh_ll_rw_block cleanup
In ufs code there is function: ubh_ll_rw_block, it has parameter how many ufs_buffer_head it should handle, but it always called with "1" on the place of this parameter. This patch removes unused parameter of "ubh_ll_wr_block". Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
ee3ffd6c12
commit
098d5af7be
|
@ -109,7 +109,7 @@ void ufs_free_fragments(struct inode *inode, unsigned fragment, unsigned count)
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
sb->s_dirt = 1;
|
sb->s_dirt = 1;
|
||||||
|
@ -195,7 +195,7 @@ do_more:
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -521,7 +521,7 @@ ufs_add_fragments (struct inode * inode, unsigned fragment,
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
sb->s_dirt = 1;
|
sb->s_dirt = 1;
|
||||||
|
@ -646,7 +646,7 @@ succed:
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
sb->s_dirt = 1;
|
sb->s_dirt = 1;
|
||||||
|
|
|
@ -116,7 +116,7 @@ void ufs_free_inode (struct inode * inode)
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,7 +240,7 @@ cg_found:
|
||||||
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
ubh_mark_buffer_dirty (USPI_UBH(uspi));
|
||||||
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
|
||||||
if (sb->s_flags & MS_SYNCHRONOUS) {
|
if (sb->s_flags & MS_SYNCHRONOUS) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi);
|
ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
|
||||||
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
ubh_wait_on_buffer (UCPI_UBH(ucpi));
|
||||||
}
|
}
|
||||||
sb->s_dirt = 1;
|
sb->s_dirt = 1;
|
||||||
|
|
|
@ -238,7 +238,7 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p)
|
||||||
ind_ubh = NULL;
|
ind_ubh = NULL;
|
||||||
}
|
}
|
||||||
if (IS_SYNC(inode) && ind_ubh && ubh_buffer_dirty(ind_ubh)) {
|
if (IS_SYNC(inode) && ind_ubh && ubh_buffer_dirty(ind_ubh)) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, &ind_ubh);
|
ubh_ll_rw_block(SWRITE, ind_ubh);
|
||||||
ubh_wait_on_buffer (ind_ubh);
|
ubh_wait_on_buffer (ind_ubh);
|
||||||
}
|
}
|
||||||
ubh_brelse (ind_ubh);
|
ubh_brelse (ind_ubh);
|
||||||
|
@ -301,7 +301,7 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
|
||||||
dind_bh = NULL;
|
dind_bh = NULL;
|
||||||
}
|
}
|
||||||
if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh)) {
|
if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh)) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, &dind_bh);
|
ubh_ll_rw_block(SWRITE, dind_bh);
|
||||||
ubh_wait_on_buffer (dind_bh);
|
ubh_wait_on_buffer (dind_bh);
|
||||||
}
|
}
|
||||||
ubh_brelse (dind_bh);
|
ubh_brelse (dind_bh);
|
||||||
|
@ -361,7 +361,7 @@ static int ufs_trunc_tindirect (struct inode * inode)
|
||||||
tind_bh = NULL;
|
tind_bh = NULL;
|
||||||
}
|
}
|
||||||
if (IS_SYNC(inode) && tind_bh && ubh_buffer_dirty(tind_bh)) {
|
if (IS_SYNC(inode) && tind_bh && ubh_buffer_dirty(tind_bh)) {
|
||||||
ubh_ll_rw_block (SWRITE, 1, &tind_bh);
|
ubh_ll_rw_block(SWRITE, tind_bh);
|
||||||
ubh_wait_on_buffer (tind_bh);
|
ubh_wait_on_buffer (tind_bh);
|
||||||
}
|
}
|
||||||
ubh_brelse (tind_bh);
|
ubh_brelse (tind_bh);
|
||||||
|
|
|
@ -112,13 +112,12 @@ void ubh_mark_buffer_uptodate (struct ufs_buffer_head * ubh, int flag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ubh_ll_rw_block (int rw, unsigned nr, struct ufs_buffer_head * ubh[])
|
void ubh_ll_rw_block(int rw, struct ufs_buffer_head *ubh)
|
||||||
{
|
{
|
||||||
unsigned i;
|
|
||||||
if (!ubh)
|
if (!ubh)
|
||||||
return;
|
return;
|
||||||
for ( i = 0; i < nr; i++ )
|
|
||||||
ll_rw_block (rw, ubh[i]->count, ubh[i]->bh);
|
ll_rw_block(rw, ubh->count, ubh->bh);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ubh_wait_on_buffer (struct ufs_buffer_head * ubh)
|
void ubh_wait_on_buffer (struct ufs_buffer_head * ubh)
|
||||||
|
|
|
@ -242,7 +242,7 @@ extern void ubh_brelse (struct ufs_buffer_head *);
|
||||||
extern void ubh_brelse_uspi (struct ufs_sb_private_info *);
|
extern void ubh_brelse_uspi (struct ufs_sb_private_info *);
|
||||||
extern void ubh_mark_buffer_dirty (struct ufs_buffer_head *);
|
extern void ubh_mark_buffer_dirty (struct ufs_buffer_head *);
|
||||||
extern void ubh_mark_buffer_uptodate (struct ufs_buffer_head *, int);
|
extern void ubh_mark_buffer_uptodate (struct ufs_buffer_head *, int);
|
||||||
extern void ubh_ll_rw_block (int, unsigned, struct ufs_buffer_head **);
|
extern void ubh_ll_rw_block(int, struct ufs_buffer_head *);
|
||||||
extern void ubh_wait_on_buffer (struct ufs_buffer_head *);
|
extern void ubh_wait_on_buffer (struct ufs_buffer_head *);
|
||||||
extern void ubh_bforget (struct ufs_buffer_head *);
|
extern void ubh_bforget (struct ufs_buffer_head *);
|
||||||
extern int ubh_buffer_dirty (struct ufs_buffer_head *);
|
extern int ubh_buffer_dirty (struct ufs_buffer_head *);
|
||||||
|
|
Loading…
Reference in a new issue