diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /fs/ufs | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 7801add9a..eb1d86d18 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -136,6 +136,7 @@ int ufs_frag_map(struct inode *inode, int frag) ufs_block_bmap(bread(sb->s_dev, uspi->s_sbbase + i, sb->s_blocksize), frag & uspi->s_apbmask, uspi, swab)); + goto out; } frag -= 1 << (uspi->s_apbshift + uspi->s_fpbshift); if (frag < (1 << (uspi->s_2apbshift + uspi->s_fpbshift))) { @@ -744,9 +745,9 @@ static int ufs_update_inode(struct inode * inode, int do_sync) return 0; } -void ufs_write_inode (struct inode * inode) +void ufs_write_inode (struct inode * inode, int wait) { - ufs_update_inode (inode, 0); + ufs_update_inode (inode, wait); } int ufs_sync_inode (struct inode *inode) |