diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/Documentation/filesystems/devfs/README ./linux/Documentation/filesystems/devfs/README --- ../linux-2.4.0test11-ac3/linux/Documentation/filesystems/devfs/README Thu Jul 6 06:36:49 2000 +++ ./linux/Documentation/filesystems/devfs/README Sat Nov 25 03:07:21 2000 @@ -529,7 +529,7 @@ If you want to construct a minimal chroot() gaol, the following command should suffice: -mount -t bind /dev/null /gaol/dev/null +mount --bind /dev/null /gaol/dev/null Repeat for other device nodes you want to expose. Simple! @@ -739,7 +739,7 @@ add the following lines near the very beginning of your boot scripts: -mount -t bind /dev /dev-state +mount --bind /dev /dev-state mount -t devfs none /dev devfsd /dev diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/Makefile ./linux/Makefile --- ../linux-2.4.0test11-ac3/linux/Makefile Sat Nov 25 02:21:04 2000 +++ ./linux/Makefile Sat Nov 25 03:06:42 2000 @@ -209,7 +209,6 @@ drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \ drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \ drivers/net/hamradio/soundmodem/gentbl \ - drivers/char/hfmodem/gentbl drivers/char/hfmodem/tables.h \ drivers/sound/*_boot.h drivers/sound/.*.boot \ drivers/sound/msndinit.c \ drivers/sound/msndperm.c \ diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/fs/isofs/dir.c ./linux/fs/isofs/dir.c --- ../linux-2.4.0test11-ac3/linux/fs/isofs/dir.c Sat Nov 25 02:20:47 2000 +++ ./linux/fs/isofs/dir.c Sun Nov 26 18:32:25 2000 @@ -5,8 +5,8 @@ * * (C) 1991 Linus Torvalds - minix filesystem * - * Steve Beynon : Missing last directory entries fixed - * (stephen@askone.demon.co.uk) : 21st June 1996 + * Steve Beynon : Missing last directory entries fixed + * (stephen@askone.demon.co.uk) : 21st June 1996 * * isofs directory handling functions */ @@ -40,7 +40,8 @@ lookup: isofs_lookup, }; -int isofs_name_translate(struct iso_directory_record *de, char *new, struct inode *inode) +int isofs_name_translate(struct iso_directory_record *de, char *new, + struct inode *inode) { char * old = de->name; int len = de->name_len[0]; @@ -97,12 +98,15 @@ } /* - * This should _really_ be cleaned up some day.. + * Read directory and call the filldir() argument until either + * all entries were handled, or filldir() returns an error. + * Return 0. */ static int do_isofs_readdir(struct inode *inode, struct file *filp, void *dirent, filldir_t filldir, char * tmpname, struct iso_directory_record * tmpde) { + /* Assumption: ISOFS_BUFFER_SIZE is at most 2048 */ unsigned long bufsize = ISOFS_BUFFER_SIZE(inode); unsigned char bufbits = ISOFS_BUFFER_BITS(inode); unsigned int block, offset; @@ -115,9 +119,6 @@ char *p = NULL; /* Quiet GCC */ struct iso_directory_record *de; - if (filp->f_pos >= inode->i_size) - return 0; - offset = filp->f_pos & (bufsize - 1); block = filp->f_pos >> bufbits; high_sierra = inode->i_sb->u.isofs_sb.s_high_sierra; @@ -132,7 +133,8 @@ } de = (struct iso_directory_record *) (bh->b_data + offset); - if (first_de) inode_number = (bh->b_blocknr << bufbits) + offset; + if (first_de) + inode_number = (bh->b_blocknr << bufbits) + offset; de_len = *(unsigned char *) de; @@ -165,7 +167,7 @@ return 0; memcpy((void *) tmpde + slop, bh->b_data, offset); } - de = tmpde; + de = tmpde; } if (de->flags[-high_sierra] & 0x80) { @@ -207,7 +209,7 @@ map = 1; if (inode->i_sb->u.isofs_sb.s_rock) { len = get_rock_ridge_filename(de, tmpname, inode); - if (len != 0) { + if (len != 0) { /* may be -1 */ p = tmpname; map = 0; } @@ -239,7 +241,8 @@ continue; } - if (bh) brelse(bh); + if (bh) + brelse(bh); return 0; } diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/fs/isofs/inode.c ./linux/fs/isofs/inode.c --- ../linux-2.4.0test11-ac3/linux/fs/isofs/inode.c Sat Nov 25 02:20:47 2000 +++ ./linux/fs/isofs/inode.c Sun Nov 26 22:03:35 2000 @@ -437,7 +437,7 @@ i = ioctl_by_bdev(bdev, CDROMMULTISESSION, (unsigned long) &ms_info); if(session > 0) printk(KERN_ERR "Invalid session number\n"); #if 0 - printk("isofs.inode: CDROMMULTISESSION: rc=%d\n",i); + printk("isofs.inode: CDROMMULTISESSION: rc=%d\n", i); if (i==0) { printk("isofs.inode: XA disk: %s\n",ms_info.xa_flag?"yes":"no"); printk("isofs.inode: vol_desc_start = %d\n", ms_info.addr.lba); @@ -500,15 +500,13 @@ * that value. */ blocksize = get_hardblocksize(dev); - if( (blocksize != 0) - && (blocksize > opt.blocksize) ) - { + if (blocksize > opt.blocksize) { /* * Force the blocksize we are going to use to be the * hardware blocksize. */ opt.blocksize = blocksize; - } + } blocksize_bits = 0; { @@ -605,9 +603,8 @@ pri_bh = NULL; root_found: - brelse(pri_bh); - if (joliet_level && opt.rock == 'n') { + if (joliet_level && (pri == NULL || opt.rock == 'n')) { /* This is the case of Joliet with the norock mount flag. * A disc with both Joliet and Rock Ridge is handled later */ @@ -704,6 +701,7 @@ * We're all done using the volume descriptor, and may need * to change the device blocksize, so release the buffer now. */ + brelse(pri_bh); brelse(bh); /* @@ -756,8 +754,9 @@ s->u.isofs_sb.s_gid = opt.gid; s->u.isofs_sb.s_utf8 = opt.utf8; /* - * It would be incredibly stupid to allow people to mark every file on the disk - * as suid, so we merely allow them to set the default permissions. + * It would be incredibly stupid to allow people to mark every file + * on the disk as suid, so we merely allow them to set the default + * permissions. */ s->u.isofs_sb.s_mode = opt.mode & 0777; @@ -873,7 +872,7 @@ /* Life is simpler than for other filesystem since we never * have to create a new block, only find an existing one. */ -int isofs_get_block(struct inode *inode, long iblock, +static int isofs_get_block(struct inode *inode, long iblock, struct buffer_head *bh_result, int create) { unsigned long b_off; @@ -1019,10 +1018,7 @@ unsigned long block, offset; int i = 0; int more_entries = 0; - struct iso_directory_record * tmpde = kmalloc(256, GFP_KERNEL); - - if (!tmpde) - return -ENOMEM; + struct iso_directory_record * tmpde = NULL; inode->i_size = 0; inode->u.isofs_i.i_next_section_ino = 0; @@ -1056,6 +1052,11 @@ /* Make sure we have a full directory entry */ if (offset >= bufsize) { int slop = bufsize - offset + de_len; + if (!tmpde) { + tmpde = kmalloc(256, GFP_KERNEL); + if (!tmpde) + goto out_nomem; + } memcpy(tmpde, de, slop); offset &= bufsize - 1; block++; @@ -1082,14 +1083,23 @@ goto out_toomany; } while(more_entries); out: - kfree(tmpde); - if (bh) brelse(bh); + if (tmpde) + kfree(tmpde); + if (bh) + brelse(bh); return 0; +out_nomem: + if (bh) + brelse(bh); + return -ENOMEM; + out_noread: printk(KERN_INFO "ISOFS: unable to read i-node block %lu\n", block); - kfree(tmpde); - return 1; + if (tmpde) + kfree(tmpde); + return -EIO; + out_toomany: printk(KERN_INFO "isofs_read_level3_size: " "More than 100 file sections ?!?, aborting...\n" @@ -1104,22 +1114,38 @@ unsigned long bufsize = ISOFS_BUFFER_SIZE(inode); int block = inode->i_ino >> ISOFS_BUFFER_BITS(inode); int high_sierra = sb->u.isofs_sb.s_high_sierra; - struct buffer_head * bh; - struct iso_directory_record * raw_inode; - unsigned char *pnt; - int volume_seq_no, i; + struct buffer_head * bh = NULL; + struct iso_directory_record * de; + struct iso_directory_record * tmpde = NULL; + unsigned int de_len; + int volume_seq_no, i, offset; bh = bread(inode->i_dev, block, bufsize); - if (!bh) { - printk(KERN_WARNING "ISOFS: unable to read i-node block\n"); - goto fail; - } + if (!bh) + goto out_badread; - pnt = ((unsigned char *) bh->b_data - + (inode->i_ino & (bufsize - 1))); - raw_inode = ((struct iso_directory_record *) pnt); + offset = (inode->i_ino & (bufsize - 1)); + de = (struct iso_directory_record *) (bh->b_data + offset); + de_len = *(unsigned char *) de; + + if (offset + de_len > bufsize){ + int frag1 = bufsize - offset; + + tmpde = kmalloc(de_len, GFP_KERNEL); + if (tmpde == NULL) { + printk(KERN_INFO "isofs_read_inode: out of memory\n"); + goto fail; + } + memcpy(tmpde, bh->b_data + offset, frag1); + brelse(bh); + bh = bread(inode->i_dev, ++block, bufsize); + if (!bh) + goto out_badread; + memcpy((char *)tmpde+frag1, bh->b_data, de_len - frag1); + de = tmpde; + } - if (raw_inode->flags[-high_sierra] & 2) { + if (de->flags[-high_sierra] & 2) { inode->i_mode = S_IRUGO | S_IXUGO | S_IFDIR; inode->i_nlink = 1; /* Set to 1. We know there are 2, but the find utility tries to optimize @@ -1134,10 +1160,10 @@ /* If there are no periods in the name, * then set the execute permission bit */ - for(i=0; i< raw_inode->name_len[0]; i++) - if(raw_inode->name[i]=='.' || raw_inode->name[i]==';') + for(i=0; i< de->name_len[0]; i++) + if(de->name[i]=='.' || de->name[i]==';') break; - if(i == raw_inode->name_len[0] || raw_inode->name[i] == ';') + if(i == de->name_len[0] || de->name[i] == ';') inode->i_mode |= S_IXUGO; /* execute permission */ } inode->i_uid = inode->i_sb->u.isofs_sb.s_uid; @@ -1145,84 +1171,77 @@ inode->i_blocks = inode->i_blksize = 0; - inode->u.isofs_i.i_section_size = isonum_733 (raw_inode->size); - if(raw_inode->flags[-high_sierra] & 0x80) { + inode->u.isofs_i.i_section_size = isonum_733 (de->size); + if (de->flags[-high_sierra] & 0x80) { if(isofs_read_level3_size(inode)) goto fail; } else { - inode->i_size = isonum_733 (raw_inode->size); + inode->i_size = isonum_733 (de->size); } /* There are defective discs out there - we do this to protect ourselves. A cdrom will never contain more than 800Mb .. but a DVD may be up to 1Gig (Ulrich Habel) */ - if((inode->i_size < 0 || inode->i_size > 1073741824) && - inode->i_sb->u.isofs_sb.s_cruft == 'n') { - printk(KERN_WARNING "Warning: defective CD-ROM. Enabling \"cruft\" mount option.\n"); - inode->i_sb->u.isofs_sb.s_cruft = 'y'; + + if ((inode->i_size < 0 || inode->i_size > 1073741824) && + inode->i_sb->u.isofs_sb.s_cruft == 'n') { + printk(KERN_WARNING "Warning: defective CD-ROM. " + "Enabling \"cruft\" mount option.\n"); + inode->i_sb->u.isofs_sb.s_cruft = 'y'; } -/* Some dipshit decided to store some other bit of information in the high - byte of the file length. Catch this and holler. WARNING: this will make - it impossible for a file to be > 16Mb on the CDROM!!!*/ + /* + * Some dipshit decided to store some other bit of information + * in the high byte of the file length. Catch this and holler. + * WARNING: this will make it impossible for a file to be > 16MB + * on the CDROM. + */ - if(inode->i_sb->u.isofs_sb.s_cruft == 'y' && + if (inode->i_sb->u.isofs_sb.s_cruft == 'y' && inode->i_size & 0xff000000){ -/* printk("Illegal format on cdrom. Pester manufacturer.\n"); */ - inode->i_size &= 0x00ffffff; + inode->i_size &= 0x00ffffff; } - if (raw_inode->interleave[0]) { + if (de->interleave[0]) { printk("Interleaved files not (yet) supported.\n"); inode->i_size = 0; } /* I have no idea what file_unit_size is used for, so we will flag it for now */ - if(raw_inode->file_unit_size[0] != 0){ - printk("File unit size != 0 for ISO file (%ld).\n",inode->i_ino); + if (de->file_unit_size[0] != 0){ + printk("File unit size != 0 for ISO file (%ld).\n", + inode->i_ino); } /* I have no idea what other flag bits are used for, so we will flag it for now */ #ifdef DEBUG - if((raw_inode->flags[-high_sierra] & ~2)!= 0){ + if ((de->flags[-high_sierra] & ~2)!= 0){ printk("Unusual flag settings for ISO file (%ld %x).\n", - inode->i_ino, raw_inode->flags[-high_sierra]); + inode->i_ino, de->flags[-high_sierra]); } #endif -#ifdef DEBUG - printk("Get inode %x: %d %d: %d\n",inode->i_ino, block, - ((int)pnt) & 0x3ff, inode->i_size); -#endif - inode->i_mtime = inode->i_atime = inode->i_ctime = - iso_date(raw_inode->date, high_sierra); + iso_date(de->date, high_sierra); - inode->u.isofs_i.i_first_extent = (isonum_733 (raw_inode->extent) + - isonum_711 (raw_inode->ext_attr_length)); + inode->u.isofs_i.i_first_extent = (isonum_733 (de->extent) + + isonum_711 (de->ext_attr_length)); -/* Now test for possible Rock Ridge extensions which will override some of - these numbers in the inode structure. */ + /* + * Now test for possible Rock Ridge extensions which will override + * some of these numbers in the inode structure. + */ if (!high_sierra) { - parse_rock_ridge_inode(raw_inode, inode); - /* hmm..if we want uid or gid set, override the rock ridge setting */ - test_and_set_uid(&inode->i_uid, inode->i_sb->u.isofs_sb.s_uid); - test_and_set_gid(&inode->i_gid, inode->i_sb->u.isofs_sb.s_gid); + parse_rock_ridge_inode(de, inode); + /* if we want uid/gid set, override the rock ridge setting */ + test_and_set_uid(&inode->i_uid, inode->i_sb->u.isofs_sb.s_uid); + test_and_set_gid(&inode->i_gid, inode->i_sb->u.isofs_sb.s_gid); } -#ifdef DEBUG - printk("Inode: %x extent: %x\n",inode->i_ino, inode->u.isofs_i.i_first_extent); -#endif - /* get the volume sequence number */ - volume_seq_no = isonum_723 (raw_inode->volume_sequence_number) ; - - /* - * All done with buffer ... no more references to buffer memory! - */ - brelse(bh); + volume_seq_no = isonum_723 (de->volume_sequence_number) ; /* * Disable checking if we see any volume number other than 0 or 1. @@ -1232,8 +1251,10 @@ */ if (inode->i_sb->u.isofs_sb.s_cruft == 'n' && (volume_seq_no != 0) && (volume_seq_no != 1)) { - printk(KERN_WARNING "Warning: defective CD-ROM (volume sequence number). Enabling \"cruft\" mount option.\n"); - inode->i_sb->u.isofs_sb.s_cruft = 'y'; + printk(KERN_WARNING "Warning: defective CD-ROM " + "(volume sequence number %d). " + "Enabling \"cruft\" mount option.\n", volume_seq_no); + inode->i_sb->u.isofs_sb.s_cruft = 'y'; } /* Install the inode operations vector */ @@ -1244,25 +1265,32 @@ } else #endif IGNORE_WRONG_MULTI_VOLUME_SPECS { - if (S_ISREG(inode->i_mode)) { - inode->i_fop = &generic_ro_fops; - inode->i_data.a_ops = &isofs_aops; - } else if (S_ISDIR(inode->i_mode)) { - inode->i_op = &isofs_dir_inode_operations; - inode->i_fop = &isofs_dir_operations; - } else if (S_ISLNK(inode->i_mode)) { - inode->i_op = &page_symlink_inode_operations; - inode->i_data.a_ops = &isofs_symlink_aops; - } else - /* XXX - parse_rock_ridge_inode() had already set i_rdev. */ - init_special_inode(inode, inode->i_mode, kdev_t_to_nr(inode->i_rdev)); - } + if (S_ISREG(inode->i_mode)) { + inode->i_fop = &generic_ro_fops; + inode->i_data.a_ops = &isofs_aops; + } else if (S_ISDIR(inode->i_mode)) { + inode->i_op = &isofs_dir_inode_operations; + inode->i_fop = &isofs_dir_operations; + } else if (S_ISLNK(inode->i_mode)) { + inode->i_op = &page_symlink_inode_operations; + inode->i_data.a_ops = &isofs_symlink_aops; + } else + /* XXX - parse_rock_ridge_inode() had set i_rdev. */ + init_special_inode(inode, inode->i_mode, + kdev_t_to_nr(inode->i_rdev)); + } + out: + if (tmpde) + kfree(tmpde); + if (bh) + brelse(bh); return; - fail: - /* With a data error we return this information */ + out_badread: + printk(KERN_WARNING "ISOFS: unable to read i-node block\n"); + fail: make_bad_inode(inode); - return; + goto out; } #ifdef LEAK_CHECK diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/fs/isofs/namei.c ./linux/fs/isofs/namei.c --- ../linux-2.4.0test11-ac3/linux/fs/isofs/namei.c Sat Nov 25 02:20:47 2000 +++ ./linux/fs/isofs/namei.c Sun Nov 26 23:06:07 2000 @@ -53,13 +53,11 @@ * isofs_find_entry() * * finds an entry in the specified directory with the wanted name. It - * returns the cache buffer in which the entry was found, and the entry - * itself (as an inode number). It does NOT read the inode of the - * entry - you'll have to do that yourself if you want to. + * returns the inode number of the found entry, or 0 on error. */ static unsigned long isofs_find_entry(struct inode *dir, struct dentry *dentry, - char * tmpname, struct iso_directory_record * tmpde) + char *tmpname, struct iso_directory_record *tmpde) { unsigned long inode_number; unsigned long bufsize = ISOFS_BUFFER_SIZE(dir); @@ -123,7 +121,7 @@ if (dir->i_sb->u.isofs_sb.s_rock && ((i = get_rock_ridge_filename(de, tmpname, dir)))) { - dlen = i; + dlen = i; /* possibly -1 */ dpnt = tmpname; #ifdef CONFIG_JOLIET } else if (dir->i_sb->u.isofs_sb.s_joliet_level) { @@ -142,17 +140,20 @@ * Skip hidden or associated files unless unhide is set */ match = 0; - if ((!(de->flags[-dir->i_sb->u.isofs_sb.s_high_sierra] & 5) - || dir->i_sb->u.isofs_sb.s_unhide == 'y') && dlen) + if (dlen > 0 && + (!(de->flags[-dir->i_sb->u.isofs_sb.s_high_sierra] & 5) + || dir->i_sb->u.isofs_sb.s_unhide == 'y')) { match = (isofs_cmp(dentry,dpnt,dlen) == 0); } if (match) { - if (bh) brelse(bh); + if (bh) + brelse(bh); return inode_number; } } - if (bh) brelse(bh); + if (bh) + brelse(bh); return 0; } @@ -162,13 +163,14 @@ struct inode *inode; struct page *page; -#ifdef DEBUG - printk("lookup: %x %s\n",dir->i_ino, dentry->d_name.name); -#endif dentry->d_op = dir->i_sb->s_root->d_op; page = alloc_page(GFP_USER); - ino = isofs_find_entry(dir, dentry, page_address(page), 1024 + page_address(page)); + if (!page) + return ERR_PTR(-ENOMEM); + + ino = isofs_find_entry(dir, dentry, page_address(page), + 1024 + page_address(page)); __free_page(page); inode = NULL; diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/fs/isofs/rock.c ./linux/fs/isofs/rock.c --- ../linux-2.4.0test11-ac3/linux/fs/isofs/rock.c Sat Nov 25 02:20:47 2000 +++ ./linux/fs/isofs/rock.c Sat Nov 25 10:28:58 2000 @@ -72,7 +72,7 @@ cont_size = 0; \ cont_offset = 0; \ goto LABEL; \ - }; \ + } \ printk("Unable to read rock-ridge attributes\n"); \ }} @@ -120,22 +120,16 @@ CHECK_SP(goto out); break; case SIG('C','L'): -#ifdef DEBUG - printk("RR: CL\n"); -#endif if (flag == 0) { retval = isonum_733(rr->u.CL.location); goto out; - }; + } break; case SIG('P','L'): -#ifdef DEBUG - printk("RR: PL\n"); -#endif if (flag != 0) { retval = isonum_733(rr->u.PL.location); goto out; - }; + } break; case SIG('C','E'): CHECK_CE; /* This tells is if there is a continuation record */ @@ -143,8 +137,8 @@ default: break; } - }; - }; + } + } MAYBE_CONTINUE(repeat, inode); return retval; out: @@ -152,6 +146,7 @@ return retval; } +/* return length of name field; 0: not found, -1: to be ignored */ int get_rock_ridge_filename(struct iso_directory_record * de, char * retname, struct inode * inode) { @@ -202,24 +197,21 @@ if (rr->u.NM.flags & ~1) { printk("Unsupported NM flag settings (%d)\n",rr->u.NM.flags); break; - }; + } if((strlen(retname) + rr->len - 5) >= 254) { truncate = 1; break; - }; + } strncat(retname, rr->u.NM.name, rr->len - 5); retnamlen += rr->len - 5; break; case SIG('R','E'): -#ifdef DEBUG - printk("RR: RE (%x)\n", inode->i_ino); -#endif if (buffer) kfree(buffer); - return 0; + return -1; default: break; } - }; + } } MAYBE_CONTINUE(repeat,inode); return retnamlen; /* If 0, this file did not have a NM field */ @@ -265,19 +257,21 @@ break; case SIG('E','R'): inode->i_sb->u.isofs_sb.s_rock = 1; - printk(KERN_DEBUG"ISO 9660 Extensions: "); + printk(KERN_DEBUG "ISO 9660 Extensions: "); { int p; for(p=0;pu.ER.len_id;p++) printk("%c",rr->u.ER.data[p]); - }; + } printk("\n"); break; case SIG('P','X'): + /* isonum_711(rr->len) should be 36 */ inode->i_mode = isonum_733(rr->u.PX.mode); inode->i_nlink = isonum_733(rr->u.PX.n_links); inode->i_uid = isonum_733(rr->u.PX.uid); inode->i_gid = isonum_733(rr->u.PX.gid); break; case SIG('P','N'): + /* isonum_711(rr->len) should be 20 */ { int high, low; high = isonum_733(rr->u.PN.dev_high); low = isonum_733(rr->u.PN.dev_low); @@ -293,7 +287,7 @@ } else { inode->i_rdev = MKDEV(high, low); } - }; + } break; case SIG('T','F'): /* Some RRIP writers incorrectly place ctime in the TF_CREATE field. @@ -321,45 +315,46 @@ case 0: inode->i_size += slp->len; break; - case 2: + case 2: /* current directory: "." */ inode->i_size += 1; break; - case 4: + case 4: /* parent directory: ".." */ inode->i_size += 2; break; - case 8: + case 8: /* root directory: "/" */ rootflag = 1; inode->i_size += 1; break; - default: - printk("Symlink component flag not implemented\n"); - }; + case 16: /* volroot directory: current mount point */ + case 32: /* local host name */ + default: /* reserved */ + printk(KERN_DEBUG "Symlink component flag not implemented\n"); + } slen -= slp->len + 2; oldslp = slp; slp = (struct SL_component *) (((char *) slp) + slp->len + 2); if(slen < 2) { - if( ((rr->u.SL.flags & 1) != 0) - && ((oldslp->flags & 1) == 0) ) inode->i_size += 1; + if((rr->u.SL.flags & 1) != 0 /* continued in next SL record */ + && (oldslp->flags & 1) == 0) /* this component is finished */ + inode->i_size += 1; /* add 1 for '/' separator */ break; } /* * If this component record isn't continued, then append a '/'. */ - if( (!rootflag) - && ((oldslp->flags & 1) == 0) ) inode->i_size += 1; + if(!rootflag && (oldslp->flags & 1) == 0) + inode->i_size += 1; } } symlink_len = inode->i_size; break; case SIG('R','E'): - printk("Attempt to read inode for relocated directory\n"); + printk(KERN_WARNING "Attempt to read inode for relocated directory\n"); goto out; case SIG('C','L'): -#ifdef DEBUG - printk("RR CL (%x)\n",inode->i_ino); -#endif + /* isonum_711(rr->len) should be 12 */ inode->u.isofs_i.i_first_extent = isonum_733(rr->u.CL.location); reloc = iget(inode->i_sb, (inode->u.isofs_i.i_first_extent << @@ -377,10 +372,10 @@ inode->i_mtime = reloc->i_mtime; iput(reloc); break; - default: + default: /* e.g. NM, PL, SF (sparse file) */ break; } - }; + } } MAYBE_CONTINUE(repeat,inode); return 0; diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/fs/isofs/util.c ./linux/fs/isofs/util.c --- ../linux-2.4.0test11-ac3/linux/fs/isofs/util.c Thu Jan 27 21:51:43 2000 +++ ./linux/fs/isofs/util.c Sun Nov 26 23:12:18 2000 @@ -98,7 +98,7 @@ int iso_date(char * p, int flag) { - int year, month, day, hour ,minute, second, tz; + int year, month, day, hour, minute, second, tz; int crtime, days, i; year = p[0] - 70; diff -u --recursive --new-file ../linux-2.4.0test11-ac3/linux/include/linux/iso_fs.h ./linux/include/linux/iso_fs.h --- ../linux-2.4.0test11-ac3/linux/include/linux/iso_fs.h Sat Nov 25 02:20:48 2000 +++ ./linux/include/linux/iso_fs.h Sat Nov 25 10:16:12 2000 @@ -185,7 +185,6 @@ int get_acorn_filename(struct iso_directory_record *, char *, struct inode *); extern struct dentry *isofs_lookup(struct inode *, struct dentry *); -extern int isofs_get_block(struct inode *, long, struct buffer_head *, int); extern int isofs_bmap(struct inode *, int); extern struct buffer_head *isofs_bread(struct inode *, unsigned int, unsigned int);