diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /fs/isofs/inode.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'fs/isofs/inode.c')
| -rw-r--r-- | fs/isofs/inode.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index b77e9facd..88cf1fd4a 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -33,6 +33,7 @@ * wrong information within the volume descriptors. */ #define IGNORE_WRONG_MULTI_VOLUME_SPECS +#define BEQUIET #ifdef LEAK_CHECK static int check_malloc = 0; @@ -237,7 +238,7 @@ static unsigned int isofs_get_last_session(kdev_t dev) * we would destroy the kernels idea about FS on root * mount in read_super... [chexum] */ - unsigned long old_fs=get_fs(); + mm_segment_t old_fs=get_fs(); inode_fake.i_rdev=dev; ms_info.addr_format=CDROM_LBA; set_fs(KERNEL_DS); @@ -500,7 +501,8 @@ struct super_block *isofs_read_super(struct super_block *s,void *data, s->s_flags |= MS_RDONLY /* | MS_NODEV | MS_NOSUID */; brelse(bh); - + +#ifndef BEQUIET printk(KERN_DEBUG "Max size:%ld Log zone size:%ld\n", s->u.isofs_sb.s_max_size, 1UL << s->u.isofs_sb.s_log_zone_size); @@ -509,6 +511,7 @@ struct super_block *isofs_read_super(struct super_block *s,void *data, (isonum_733(rootp->extent) + isonum_711(rootp->ext_attr_length)) << s -> u.isofs_sb.s_log_zone_size); if(high_sierra) printk(KERN_DEBUG "Disc in High Sierra format.\n"); +#endif unlock_super(s); /* set up enough so that it can read an inode */ @@ -541,7 +544,9 @@ struct super_block *isofs_read_super(struct super_block *s,void *data, } } set_blocksize(dev, opt.blocksize); +#ifndef BEQUIET printk(KERN_DEBUG "Forcing new log zone size:%d\n", opt.blocksize); +#endif } #ifdef CONFIG_JOLIET |