3 files changed, 9 insertions, 18 deletions

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 997640c99c7d..faf1512173eb 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -114,8 +114,7 @@ void ufs_free_fragments (struct inode * inode, unsigned fragment, unsigned count
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **)&ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
         sb->s_dirt = 1;
@@ -200,8 +199,7 @@ do_more:
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **)&ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
 
@@ -459,8 +457,7 @@ ufs_add_fragments (struct inode * inode, unsigned fragment,
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **)&ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
         sb->s_dirt = 1;
@@ -585,8 +582,7 @@ succed:
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **)&ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **)&ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
         sb->s_dirt = 1;
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 61a6b1542fc5..0938945b9cbc 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -124,8 +124,7 @@ void ufs_free_inode (struct inode * inode)
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **) &ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
         
@@ -249,8 +248,7 @@ cg_found:
         ubh_mark_buffer_dirty (USPI_UBH);
         ubh_mark_buffer_dirty (UCPI_UBH);
         if (sb->s_flags & MS_SYNCHRONOUS) {
-                ubh_wait_on_buffer (UCPI_UBH);
-                ubh_ll_rw_block (WRITE, 1, (struct ufs_buffer_head **) &ucpi);
+                ubh_ll_rw_block (SWRITE, 1, (struct ufs_buffer_head **) &ucpi);
                 ubh_wait_on_buffer (UCPI_UBH);
         }
         sb->s_dirt = 1;
diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c
index e312bf8bad9f..61d2e35012a4 100644
--- a/fs/ufs/truncate.c
+++ b/fs/ufs/truncate.c
@@ -285,8 +285,7 @@ next:;
                 }
         }
         if (IS_SYNC(inode) && ind_ubh && ubh_buffer_dirty(ind_ubh)) {
-                ubh_wait_on_buffer (ind_ubh);
-                ubh_ll_rw_block (WRITE, 1, &ind_ubh);
+                ubh_ll_rw_block (SWRITE, 1, &ind_ubh);
                 ubh_wait_on_buffer (ind_ubh);
         }
         ubh_brelse (ind_ubh);
@@ -353,8 +352,7 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
                 }
         }
         if (IS_SYNC(inode) && dind_bh && ubh_buffer_dirty(dind_bh)) {
-                ubh_wait_on_buffer (dind_bh);
-                ubh_ll_rw_block (WRITE, 1, &dind_bh);
+                ubh_ll_rw_block (SWRITE, 1, &dind_bh);
                 ubh_wait_on_buffer (dind_bh);
         }
         ubh_brelse (dind_bh);
@@ -418,8 +416,7 @@ static int ufs_trunc_tindirect (struct inode * inode)
                 }
         }
         if (IS_SYNC(inode) && tind_bh && ubh_buffer_dirty(tind_bh)) {
-                ubh_wait_on_buffer (tind_bh);
-                ubh_ll_rw_block (WRITE, 1, &tind_bh);
+                ubh_ll_rw_block (SWRITE, 1, &tind_bh);
                 ubh_wait_on_buffer (tind_bh);
         }
         ubh_brelse (tind_bh);