aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ufs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/balloc.c8
-rw-r--r--fs/ufs/ialloc.c4
-rw-r--r--fs/ufs/truncate.c6
-rw-r--r--fs/ufs/util.c7
-rw-r--r--fs/ufs/util.h2
5 files changed, 13 insertions, 14 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index cb36d2dadef5..95b878e5c7a0 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -109,7 +109,7 @@ void ufs_free_fragments(struct inode *inode, unsigned fragment, unsigned count)
109 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 109 ubh_mark_buffer_dirty (USPI_UBH(uspi));
110 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 110 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
111 if (sb->s_flags & MS_SYNCHRONOUS) { 111 if (sb->s_flags & MS_SYNCHRONOUS) {
112 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi); 112 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
113 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 113 ubh_wait_on_buffer (UCPI_UBH(ucpi));
114 } 114 }
115 sb->s_dirt = 1; 115 sb->s_dirt = 1;
@@ -195,7 +195,7 @@ do_more:
195 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 195 ubh_mark_buffer_dirty (USPI_UBH(uspi));
196 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 196 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
197 if (sb->s_flags & MS_SYNCHRONOUS) { 197 if (sb->s_flags & MS_SYNCHRONOUS) {
198 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi); 198 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
199 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 199 ubh_wait_on_buffer (UCPI_UBH(ucpi));
200 } 200 }
201 201
@@ -521,7 +521,7 @@ ufs_add_fragments (struct inode * inode, unsigned fragment,
521 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 521 ubh_mark_buffer_dirty (USPI_UBH(uspi));
522 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 522 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
523 if (sb->s_flags & MS_SYNCHRONOUS) { 523 if (sb->s_flags & MS_SYNCHRONOUS) {
524 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi); 524 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
525 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 525 ubh_wait_on_buffer (UCPI_UBH(ucpi));
526 } 526 }
527 sb->s_dirt = 1; 527 sb->s_dirt = 1;
@@ -646,7 +646,7 @@ succed:
646 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 646 ubh_mark_buffer_dirty (USPI_UBH(uspi));
647 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 647 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
648 if (sb->s_flags & MS_SYNCHRONOUS) { 648 if (sb->s_flags & MS_SYNCHRONOUS) {
649 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi); 649 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
650 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 650 ubh_wait_on_buffer (UCPI_UBH(ucpi));
651 } 651 }
652 sb->s_dirt = 1; 652 sb->s_dirt = 1;
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 6d7527350026..9501dcd3b213 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -116,7 +116,7 @@ void ufs_free_inode (struct inode * inode)
116 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 116 ubh_mark_buffer_dirty (USPI_UBH(uspi));
117 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 117 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
118 if (sb->s_flags & MS_SYNCHRONOUS) { 118 if (sb->s_flags & MS_SYNCHRONOUS) {
119 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi); 119 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
120 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 120 ubh_wait_on_buffer (UCPI_UBH(ucpi));
121 } 121 }
122 122
@@ -240,7 +240,7 @@ cg_found:
240 ubh_mark_buffer_dirty (USPI_UBH(uspi)); 240 ubh_mark_buffer_dirty (USPI_UBH(uspi));
241 ubh_mark_buffer_dirty (UCPI_UBH(ucpi)); 241 ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
242 if (sb->s_flags & MS_SYNCHRONOUS) { 242 if (sb->s_flags & MS_SYNCHRONOUS) {
243 ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi); 243 ubh_ll_rw_block(SWRITE, UCPI_UBH(ucpi));
244 ubh_wait_on_buffer (UCPI_UBH(ucpi)); 244 ubh_wait_on_buffer (UCPI_UBH(ucpi));
245 } 245 }
246 sb->s_dirt = 1; 246 sb->s_dirt = 1;
diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c
index b860a29c4ef2..3c3b301f8701 100644
--- a/fs/ufs/truncate.c
+++ b/fs/ufs/truncate.c
@@ -238,7 +238,7 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p)
238 ind_ubh = NULL; 238 ind_ubh = NULL;
239 } 239 }
240 if (IS_SYNC(inode) && ind_ubh && ubh_buffer_dirty(ind_ubh)) { 240 if (IS_SYNC(inode) && ind_ubh && ubh_buffer_dirty(ind_ubh)) {
241 ubh_ll_rw_block (SWRITE, 1, &ind_ubh); 241 ubh_ll_rw_block(SWRITE, ind_ubh);
242 ubh_wait_on_buffer (ind_ubh); 242 ubh_wait_on_buffer (ind_ubh);
243 } 243 }
244 ubh_brelse (ind_ubh); 244 ubh_brelse (ind_ubh);
@@ -301,7 +301,7 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
301 dind_bh = NULL; 301 dind_bh = NULL;
302 } 302 }
303 if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh)) { 303 if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh)) {
304 ubh_ll_rw_block (SWRITE, 1, &dind_bh); 304 ubh_ll_rw_block(SWRITE, dind_bh);
305 ubh_wait_on_buffer (dind_bh); 305 ubh_wait_on_buffer (dind_bh);
306 } 306 }
307 ubh_brelse (dind_bh); 307 ubh_brelse (dind_bh);
@@ -361,7 +361,7 @@ static int ufs_trunc_tindirect (struct inode * inode)
361 tind_bh = NULL; 361 tind_bh = NULL;
362 } 362 }
363 if (IS_SYNC(inode) && tind_bh && ubh_buffer_dirty(tind_bh)) { 363 if (IS_SYNC(inode) && tind_bh && ubh_buffer_dirty(tind_bh)) {
364 ubh_ll_rw_block (SWRITE, 1, &tind_bh); 364 ubh_ll_rw_block(SWRITE, tind_bh);
365 ubh_wait_on_buffer (tind_bh); 365 ubh_wait_on_buffer (tind_bh);
366 } 366 }
367 ubh_brelse (tind_bh); 367 ubh_brelse (tind_bh);
diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index 4685f7cb70b2..a2f13f45708b 100644
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -112,13 +112,12 @@ void ubh_mark_buffer_uptodate (struct ufs_buffer_head * ubh, int flag)
112 } 112 }
113} 113}
114 114
115void ubh_ll_rw_block (int rw, unsigned nr, struct ufs_buffer_head * ubh[]) 115void ubh_ll_rw_block(int rw, struct ufs_buffer_head *ubh)
116{ 116{
117 unsigned i;
118 if (!ubh) 117 if (!ubh)
119 return; 118 return;
120 for ( i = 0; i < nr; i++ ) 119
121 ll_rw_block (rw, ubh[i]->count, ubh[i]->bh); 120 ll_rw_block(rw, ubh->count, ubh->bh);
122} 121}
123 122
124void ubh_wait_on_buffer (struct ufs_buffer_head * ubh) 123void ubh_wait_on_buffer (struct ufs_buffer_head * ubh)
diff --git a/fs/ufs/util.h b/fs/ufs/util.h
index 99bfd6bba6d0..406981fff5e7 100644
--- a/fs/ufs/util.h
+++ b/fs/ufs/util.h
@@ -242,7 +242,7 @@ extern void ubh_brelse (struct ufs_buffer_head *);
242extern void ubh_brelse_uspi (struct ufs_sb_private_info *); 242extern void ubh_brelse_uspi (struct ufs_sb_private_info *);
243extern void ubh_mark_buffer_dirty (struct ufs_buffer_head *); 243extern void ubh_mark_buffer_dirty (struct ufs_buffer_head *);
244extern void ubh_mark_buffer_uptodate (struct ufs_buffer_head *, int); 244extern void ubh_mark_buffer_uptodate (struct ufs_buffer_head *, int);
245extern void ubh_ll_rw_block (int, unsigned, struct ufs_buffer_head **); 245extern void ubh_ll_rw_block(int, struct ufs_buffer_head *);
246extern void ubh_wait_on_buffer (struct ufs_buffer_head *); 246extern void ubh_wait_on_buffer (struct ufs_buffer_head *);
247extern void ubh_bforget (struct ufs_buffer_head *); 247extern void ubh_bforget (struct ufs_buffer_head *);
248extern int ubh_buffer_dirty (struct ufs_buffer_head *); 248extern int ubh_buffer_dirty (struct ufs_buffer_head *);