Ok, Russell King found some problems just a few minutes
after I put the last patch up. This should clear those
issues..
Again, it's passed my readonly loopback test, but that's
all.. YMMV.
regards,
-- Dave.diff -urN linux-2.3.99pre3/fs/affs/bitmap.c linux-2.3.99pre3-dj/fs/affs/bitmap.c --- linux-2.3.99pre3/fs/affs/bitmap.c Fri May 8 06:58:04 1998 +++ linux-2.3.99pre3-dj/fs/affs/bitmap.c Thu Mar 30 01:54:18 2000 @@ -280,28 +280,17 @@ affs_new_header(struct inode *inode) { s32 block; - struct buffer_head *bh; pr_debug("AFFS: new_header(ino=%lu)\n",inode->i_ino); if (!(block = affs_balloc(inode,0))) { while (affs_find_new_zone(inode->i_sb,0)) { if ((block = affs_balloc(inode,0))) - goto init_block; + return block; schedule(); } return 0; } -init_block: - if (!(bh = getblk(inode->i_dev,block,AFFS_I2BSIZE(inode)))) { - affs_error(inode->i_sb,"new_header","Cannot get block %d",block); - return 0; - } - memset(bh->b_data,0,AFFS_I2BSIZE(inode)); - mark_buffer_uptodate(bh,1); - mark_buffer_dirty(bh,1); - affs_brelse(bh); - return block; } @@ -314,7 +303,6 @@ unsigned long oldest; struct affs_zone *zone; struct super_block *sb; - struct buffer_head *bh; int i = 0; s32 block; @@ -327,7 +315,7 @@ unlock_super(sb); block = inode->u.affs_i.i_data[inode->u.affs_i.i_pa_next++]; inode->u.affs_i.i_pa_next &= AFFS_MAX_PREALLOC - 1; - goto init_block; + return block; } unlock_super(sb); oldest = jiffies; @@ -364,24 +352,13 @@ if (!(block = affs_balloc(inode,i))) { /* No data zones left */ while (affs_find_new_zone(sb,i)) { if ((block = affs_balloc(inode,i))) - goto init_block; + return block; schedule(); } inode->u.affs_i.i_zone = 0; zone->z_ino = -1; return 0; } - -init_block: - if (!(bh = getblk(inode->i_dev,block,sb->s_blocksize))) { - affs_error(inode->i_sb,"new_data","Cannot get block %d",block); - return 0; - } - memset(bh->b_data,0,sb->s_blocksize); - mark_buffer_uptodate(bh,1); - mark_buffer_dirty(bh,1); - affs_brelse(bh); - return block; } diff -urN linux-2.3.99pre3/fs/affs/file.c linux-2.3.99pre3-dj/fs/affs/file.c --- linux-2.3.99pre3/fs/affs/file.c Thu Mar 30 20:13:09 2000 +++ linux-2.3.99pre3-dj/fs/affs/file.c Fri Mar 31 00:50:44 2000 @@ -13,6 +13,7 @@ */ #define DEBUG 0 +#include <asm/div64.h> #include <asm/uaccess.h> #include <asm/system.h> #include <linux/sched.h> @@ -23,6 +24,7 @@ #include <linux/malloc.h> #include <linux/stat.h> #include <linux/locks.h> +#include <linux/smp_lock.h> #include <linux/dirent.h> #include <linux/fs.h> #include <linux/amigaffs.h> @@ -36,7 +38,6 @@ #error PAGE_SIZE must be at least 4096 #endif -static int affs_bmap(struct inode *inode, int block); static struct buffer_head *affs_getblock(struct inode *inode, s32 block); static ssize_t affs_file_read_ofs(struct file *filp, char *buf, size_t count, loff_t *ppos); static ssize_t affs_file_write(struct file *filp, const char *buf, size_t count, loff_t *ppos); @@ -175,7 +176,7 @@ return inode->u.affs_i.i_ec->ec[index]; } -static int +int affs_bmap(struct inode *inode, int block) { struct buffer_head *bh; @@ -192,13 +193,14 @@ pr_debug("AFFS: bmap(%lu,%d)\n",inode->i_ino,block); + lock_kernel(); if (block < 0) { affs_error(inode->i_sb,"bmap","Block < 0"); - return 0; + goto out_fail; } if (!inode->u.affs_i.i_ec) { if (alloc_ext_cache(inode)) { - return 0; + goto out_fail; } } @@ -212,6 +214,7 @@ tkc = &inode->u.affs_i.i_ec->kc[i]; /* Look in any cache if the key is there */ if (block <= tkc->kc_last && block >= tkc->kc_first) { + unlock_kernel(); return tkc->kc_keys[block - tkc->kc_first]; } } @@ -246,14 +249,15 @@ for (;;) { bh = affs_bread(inode->i_dev,key,AFFS_I2BSIZE(inode)); - if (!bh) - return 0; + if (!bh) + goto out_fail; + index = seqnum_to_index(ext); if (index > inode->u.affs_i.i_ec->max_ext && (affs_checksum_block(AFFS_I2BSIZE(inode),bh->b_data,&ptype,&stype) || (ptype != T_SHORT && ptype != T_LIST) || stype != ST_FILE)) { affs_brelse(bh); - return 0; + goto out_fail; } nkey = be32_to_cpu(FILE_END(bh->b_data,inode)->extension); if (block < AFFS_I2HSIZE(inode)) { @@ -282,15 +286,56 @@ kc->kc_next_key = nkey; key = be32_to_cpu(AFFS_BLOCK(bh->b_data,inode,block)); affs_brelse(bh); +out: + unlock_kernel(); return key; + +out_fail: + key=0; + goto out; } -/* AFFS is currently broken */ -static int affs_get_block(struct inode *inode, long block, struct buffer_head *bh, int create) + +static int affs_get_block(struct inode *inode, long block, struct buffer_head *bh_result, int create) { - BUG(); - return -1; + int err, phys=0, new=0; + + if (!create) { + phys = affs_bmap(inode, block); + if (phys) { + bh_result->b_dev = inode->i_dev; + bh_result->b_blocknr = phys; + bh_result->b_state |= (1UL << BH_Mapped); + } + return 0; + } + + err = -EIO; + lock_kernel(); + if (block < 0) + goto abort_negative; + + if (affs_getblock(inode, block)==NULL) { + err = -EIO; + goto abort; + } + + bh_result->b_dev = inode->i_dev; + bh_result->b_blocknr = phys; + bh_result->b_state |= (1UL << BH_Mapped); + if (new) + bh_result->b_state |= (1UL << BH_New); + +abort: + unlock_kernel(); + return err; + +abort_negative: + affs_error(inode->i_sb,"affs_get_block","Block < 0"); + goto abort; + } + static int affs_writepage(struct dentry *dentry, struct page *page) { return block_write_full_page(page,affs_get_block); @@ -325,8 +370,7 @@ * What a mess. */ -static struct buffer_head * -affs_getblock(struct inode *inode, s32 block) +static struct buffer_head * affs_getblock(struct inode *inode, s32 block) { struct super_block *sb = inode->i_sb; int ofs = sb->u.affs_sb.s_flags & SF_OFS; @@ -340,9 +384,6 @@ pr_debug("AFFS: getblock(%lu,%d)\n",inode->i_ino,block); - if (block < 0) - goto out_fail; - key = calc_key(inode,&ext); block -= ext * AFFS_I2HSIZE(inode); pt = ext ? T_LIST : T_SHORT; @@ -370,16 +411,14 @@ for (cf = 0; j < AFFS_I2HSIZE(inode) && j <= block; j++) { if (ofs && !pbh && inode->u.affs_i.i_lastblock >= 0) { if (j > 0) { - s32 k = AFFS_BLOCK(bh->b_data, inode, - j - 1); + s32 k = AFFS_BLOCK(bh->b_data, inode, j - 1); pbh = affs_bread(inode->i_dev, be32_to_cpu(k), AFFS_I2BSIZE(inode)); } else pbh = affs_getblock(inode,inode->u.affs_i.i_lastblock); if (!pbh) { - affs_error(sb,"getblock", - "Cannot get last block in file"); + affs_error(sb,"getblock", "Cannot get last block in file"); break; } } @@ -396,8 +435,7 @@ if (ofs) { ebh = affs_bread(inode->i_dev,nkey,AFFS_I2BSIZE(inode)); if (!ebh) { - affs_error(sb,"getblock", - "Cannot get block %d",nkey); + affs_error(sb,"getblock", "Cannot get block %d",nkey); affs_free_block(sb,nkey); AFFS_BLOCK(bh->b_data,inode,j) = 0; break; @@ -405,8 +443,7 @@ DATA_FRONT(ebh)->primary_type = cpu_to_be32(T_DATA); DATA_FRONT(ebh)->header_key = cpu_to_be32(inode->i_ino); DATA_FRONT(ebh)->sequence_number = cpu_to_be32(inode->u.affs_i.i_lastblock + 1); - affs_fix_checksum(AFFS_I2BSIZE(inode), - ebh->b_data, 5); + affs_fix_checksum(AFFS_I2BSIZE(inode), ebh->b_data, 5); mark_buffer_dirty(ebh, 0); if (pbh) { DATA_FRONT(pbh)->data_size = cpu_to_be32(AFFS_I2BSIZE(inode) - 24); @@ -503,6 +540,7 @@ ssize_t blocksize; struct buffer_head *bh; void *data; + loff_t tmp; pr_debug("AFFS: file_read_ofs(ino=%lu,pos=%lu,%d)\n",inode->i_ino, (unsigned long)*ppos,count); @@ -524,10 +562,13 @@ left = MIN (inode->i_size - *ppos,count - (buf - start)); if (!left) break; - sector = affs_bmap(inode,(u32)*ppos / blocksize); + tmp = *ppos; + do_div(tmp, blocksize); + sector = affs_bmap(inode, tmp); if (!sector) break; - offset = (u32)*ppos % blocksize; + tmp = *ppos; + offset = do_div(tmp, blocksize); bh = affs_bread(inode->i_dev,sector,AFFS_I2BSIZE(inode)); if (!bh) break; @@ -544,165 +585,31 @@ } static ssize_t -affs_file_write(struct file *filp, const char *buf, size_t count, loff_t *ppos) +affs_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { - struct inode *inode = filp->f_dentry->d_inode; - off_t pos; - ssize_t written; - ssize_t c; - ssize_t blocksize; - struct buffer_head *bh; - char *p; - - if (!count) - return 0; - pr_debug("AFFS: file_write(ino=%lu,pos=%lu,count=%d)\n",inode->i_ino, - (unsigned long)*ppos,count); + ssize_t retval; - if (!inode) { - affs_error(inode->i_sb,"file_write","Inode = NULL"); - return -EINVAL; - } - if (!S_ISREG(inode->i_mode)) { - affs_error(inode->i_sb,"file_write", - "Trying to write to non-regular file (mode=%07o)", - inode->i_mode); - return -EINVAL; + retval = generic_file_write (file, buf, count, ppos); + if (retval >0) { + struct inode *inode = file->f_dentry->d_inode; + inode->i_ctime = inode->i_mtime = CURRENT_TIME; + mark_inode_dirty(inode); } - if (!inode->u.affs_i.i_ec && alloc_ext_cache(inode)) - return -ENOMEM; - if (filp->f_flags & O_APPEND) - pos = inode->i_size; - else - pos = *ppos; - written = 0; - blocksize = AFFS_I2BSIZE(inode); - - while (written < count) { - bh = affs_getblock(inode,pos / blocksize); - if (!bh) { - if (!written) - written = -ENOSPC; - break; - } - c = blocksize - (pos % blocksize); - if (c > count - written) - c = count - written; - if (c != blocksize && !buffer_uptodate(bh)) { - ll_rw_block(READ,1,&bh); - wait_on_buffer(bh); - if (!buffer_uptodate(bh)) { - affs_brelse(bh); - if (!written) - written = -EIO; - break; - } - } - p = (pos % blocksize) + bh->b_data; - c -= copy_from_user(p,buf,c); - if (!c) { - affs_brelse(bh); - if (!written) - written = -EFAULT; - break; - } - update_vm_cache(inode,pos,p,c); - mark_buffer_uptodate(bh,1); - mark_buffer_dirty(bh,0); - affs_brelse(bh); - pos += c; - written += c; - buf += c; - } - if (pos > inode->i_size) - inode->i_size = pos; - inode->i_mtime = inode->i_ctime = CURRENT_TIME; - *ppos = pos; - mark_inode_dirty(inode); - return written; + return retval; } static ssize_t -affs_file_write_ofs(struct file *filp, const char *buf, size_t count, loff_t *ppos) +affs_file_write_ofs(struct file *file, const char *buf, size_t count, loff_t *ppos) { - struct inode *inode = filp->f_dentry->d_inode; - off_t pos; - ssize_t written; - ssize_t c; - ssize_t blocksize; - struct buffer_head *bh; - char *p; - - pr_debug("AFFS: file_write_ofs(ino=%lu,pos=%lu,count=%d)\n",inode->i_ino, - (unsigned long)*ppos,count); + ssize_t retval; - if (!count) - return 0; - if (!inode) { - affs_error(inode->i_sb,"file_write_ofs","Inode = NULL"); - return -EINVAL; - } - if (!S_ISREG(inode->i_mode)) { - affs_error(inode->i_sb,"file_write_ofs", - "Trying to write to non-regular file (mode=%07o)", - inode->i_mode); - return -EINVAL; - } - if (!inode->u.affs_i.i_ec && alloc_ext_cache(inode)) - return -ENOMEM; - if (filp->f_flags & O_APPEND) - pos = inode->i_size; - else - pos = *ppos; - - bh = NULL; - blocksize = AFFS_I2BSIZE(inode) - 24; - written = 0; - while (written < count) { - bh = affs_getblock(inode,pos / blocksize); - if (!bh) { - if (!written) - written = -ENOSPC; - break; - } - c = blocksize - (pos % blocksize); - if (c > count - written) - c = count - written; - if (c != blocksize && !buffer_uptodate(bh)) { - ll_rw_block(READ,1,&bh); - wait_on_buffer(bh); - if (!buffer_uptodate(bh)) { - affs_brelse(bh); - if (!written) - written = -EIO; - break; - } - } - p = (pos % blocksize) + bh->b_data + 24; - c -= copy_from_user(p,buf,c); - if (!c) { - affs_brelse(bh); - if (!written) - written = -EFAULT; - break; - } - update_vm_cache(inode,pos,p,c); - - pos += c; - buf += c; - written += c; - DATA_FRONT(bh)->data_size = cpu_to_be32(be32_to_cpu(DATA_FRONT(bh)->data_size) + c); - affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5); - mark_buffer_uptodate(bh,1); - mark_buffer_dirty(bh,0); - affs_brelse(bh); + retval = generic_file_write (file, buf, count, ppos); + if (retval >0) { + struct inode *inode = file->f_dentry->d_inode; + inode->i_ctime = inode->i_mtime = CURRENT_TIME; + mark_inode_dirty(inode); } - if (pos > inode->i_size) - inode->i_size = pos; - *ppos = pos; - inode->i_mtime = inode->i_ctime = CURRENT_TIME; - mark_inode_dirty(inode); - return written; + return retval; } /* Free any preallocated blocks. */ @@ -746,11 +653,13 @@ int blocksize = AFFS_I2BSIZE(inode); int rem; int ext; + loff_t tmp; pr_debug("AFFS: truncate(inode=%ld,size=%lu)\n",inode->i_ino,inode->i_size); net_blocksize = blocksize - ((inode->i_sb->u.affs_sb.s_flags & SF_OFS) ? 24 : 0); - first = (inode->i_size + net_blocksize - 1) / net_blocksize; + first = inode->i_size + net_blocksize -1; + do_div (first, net_blocksize); if (inode->u.affs_i.i_lastblock < first - 1) { /* There has to be at least one new block to be allocated */ if (!inode->u.affs_i.i_ec && alloc_ext_cache(inode)) { @@ -762,7 +671,8 @@ affs_warning(inode->i_sb,"truncate","Cannot extend file"); inode->i_size = net_blocksize * (inode->u.affs_i.i_lastblock + 1); } else if (inode->i_sb->u.affs_sb.s_flags & SF_OFS) { - rem = inode->i_size % net_blocksize; + tmp = inode->i_size; + rem = do_div(tmp, net_blocksize); DATA_FRONT(bh)->data_size = cpu_to_be32(rem ? rem : net_blocksize); affs_fix_checksum(blocksize,bh->b_data,5); mark_buffer_dirty(bh,0); @@ -829,7 +739,9 @@ affs_free_block(inode->i_sb,ekey); ekey = key; } - block = ((inode->i_size + net_blocksize - 1) / net_blocksize) - 1; + block = inode->i_size + net_blocksize - 1; + do_div (block, net_blocksize); + block--; inode->u.affs_i.i_lastblock = block; /* If the file is not truncated to a block boundary, @@ -837,7 +749,8 @@ * so it cannot become accessible again. */ - rem = inode->i_size % net_blocksize; + tmp = inode->i_size; + rem = do_div(tmp, net_blocksize); if (rem) { if ((inode->i_sb->u.affs_sb.s_flags & SF_OFS)) rem += 24; diff -urN linux-2.3.99pre3/fs/affs/inode.c linux-2.3.99pre3-dj/fs/affs/inode.c --- linux-2.3.99pre3/fs/affs/inode.c Mon Feb 28 15:16:54 2000 +++ linux-2.3.99pre3-dj/fs/affs/inode.c Thu Mar 30 20:31:39 2000 @@ -11,6 +11,7 @@ */ #define DEBUG 0 +#include <asm/div64.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/malloc.h> @@ -59,6 +60,7 @@ unsigned long prot; s32 ptype, stype; unsigned short id; + loff_t tmp; pr_debug("AFFS: read_inode(%lu)\n",inode->i_ino); @@ -147,7 +149,10 @@ block = AFFS_I2BSIZE(inode) - 24; else block = AFFS_I2BSIZE(inode); - inode->u.affs_i.i_lastblock = ((inode->i_size + block - 1) / block) - 1; + tmp = inode->i_size + block -1; + do_div (tmp, block); + tmp--; + inode->u.affs_i.i_lastblock = tmp; break; case ST_SOFTLINK: inode->i_mode |= S_IFLNK;
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Mar 31 2000 - 21:00:28 EST