diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /fs/udf/inode.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'fs/udf/inode.c')
| -rw-r--r-- | fs/udf/inode.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index e7e6c53e8..4219c505f 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -200,7 +200,7 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err) else UDF_I_ALLOCTYPE(inode) = ICB_FLAG_AD_LONG; inode->i_blocks = inode->i_sb->s_blocksize / 512; - mark_buffer_dirty(bh, 1); + mark_buffer_dirty(bh); udf_release_data(bh); inode->i_data.a_ops->writepage(NULL, page); @@ -276,7 +276,7 @@ struct buffer_head * udf_expand_dir_adinicb(struct inode *inode, int *block, int return NULL; } } - mark_buffer_dirty(dbh, 1); + mark_buffer_dirty(dbh); memset(sbh->b_data + udf_file_entry_alloc_offset(inode), 0, UDF_I_LENALLOC(inode)); @@ -295,7 +295,7 @@ struct buffer_head * udf_expand_dir_adinicb(struct inode *inode, int *block, int /* UniqueID stuff */ inode->i_blocks = inode->i_sb->s_blocksize / 512; - mark_buffer_dirty(sbh, 1); + mark_buffer_dirty(sbh); udf_release_data(sbh); mark_inode_dirty(inode); inode->i_version ++; @@ -379,7 +379,7 @@ struct buffer_head * udf_getblk(struct inode * inode, long block, wait_on_buffer(bh); memset(bh->b_data, 0x00, inode->i_sb->s_blocksize); mark_buffer_uptodate(bh, 1); - mark_buffer_dirty(bh, 1); + mark_buffer_dirty(bh); } return bh; } @@ -1294,7 +1294,7 @@ udf_update_inode(struct inode *inode, int do_sync) eid->identSuffix[1] = UDF_OS_ID_LINUX; dsea->majorDeviceIdent = kdev_t_to_nr(inode->i_rdev) >> 8; dsea->minorDeviceIdent = kdev_t_to_nr(inode->i_rdev) & 0xFF; - mark_buffer_dirty(tbh, 1); + mark_buffer_dirty(tbh); udf_release_data(tbh); } @@ -1387,7 +1387,7 @@ udf_update_inode(struct inode *inode, int do_sync) fe->descTag.tagChecksum += ((Uint8 *)&(fe->descTag))[i]; /* write the data blocks */ - mark_buffer_dirty(bh, 1); + mark_buffer_dirty(bh); if (do_sync) { ll_rw_block(WRITE, 1, &bh); @@ -1557,7 +1557,7 @@ int udf_add_aext(struct inode *inode, lb_addr *bloc, int *extoffset, } } udf_update_tag((*bh)->b_data, loffset); - mark_buffer_dirty(*bh, 1); + mark_buffer_dirty(*bh); udf_release_data(*bh); *bh = nbh; } @@ -1575,7 +1575,7 @@ int udf_add_aext(struct inode *inode, lb_addr *bloc, int *extoffset, aed->lengthAllocDescs = cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) + adsize); udf_update_tag((*bh)->b_data, *extoffset + (inc ? 0 : adsize)); - mark_buffer_dirty(*bh, 1); + mark_buffer_dirty(*bh); } return ret; @@ -1634,7 +1634,7 @@ int udf_write_aext(struct inode *inode, lb_addr bloc, int *extoffset, else mark_inode_dirty(inode); - mark_buffer_dirty(*bh, 1); + mark_buffer_dirty(*bh); if (inc) *extoffset += adsize; @@ -1932,7 +1932,7 @@ int udf_delete_aext(struct inode *inode, lb_addr nbloc, int nextoffset, aed->lengthAllocDescs = cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) - (2*adsize)); udf_update_tag((obh)->b_data, oextoffset - (2*adsize)); - mark_buffer_dirty(obh, 1); + mark_buffer_dirty(obh); } } else @@ -1949,7 +1949,7 @@ int udf_delete_aext(struct inode *inode, lb_addr nbloc, int nextoffset, aed->lengthAllocDescs = cpu_to_le32(le32_to_cpu(aed->lengthAllocDescs) - adsize); udf_update_tag((obh)->b_data, oextoffset - adsize); - mark_buffer_dirty(obh, 1); + mark_buffer_dirty(obh); } } |