diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-07-31 22:31:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-07-31 22:31:26 -0700 |
| commit | d383ba51a478fbcaa37ab09af9bd8b1433028801 (patch) | |
| tree | 0380bd6c05e64f391a806ff1c97583e2dda084a5 /fs | |
| parent | 0e94855881664384004a6b310b1a80d528751c06 (diff) | |
| parent | bccdb12ca468f698fc7b61a00d1b8b225399c5e7 (diff) | |
Merge with Rusty 'trivial' Russell
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Config.in | 2 | ||||
| -rw-r--r-- | fs/smbfs/smbiod.c | 1 | ||||
| -rw-r--r-- | fs/ufs/super.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/fs/Config.in b/fs/Config.in index ffb3b91725c0..1c8e8253459e 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -26,7 +26,7 @@ dep_tristate 'Apple Macintosh file system support (EXPERIMENTAL)' CONFIG_HFS_FS dep_tristate 'BFS file system support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL -tristate 'Ext3 journalling file system support (EXPERIMENTAL)' CONFIG_EXT3_FS +tristate 'Ext3 journalling file system support' CONFIG_EXT3_FS # CONFIG_JBD could be its own option (even modular), but until there are # other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS # dep_tristate ' Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c index 98e5bae274f2..732449552331 100644 --- a/fs/smbfs/smbiod.c +++ b/fs/smbfs/smbiod.c @@ -269,6 +269,7 @@ static void smbiod_doio(struct smb_sb_info *server) set_bit(SMBIOD_DATA_READY, &smbiod_flags); out: + return; } /* diff --git a/fs/ufs/super.c b/fs/ufs/super.c index a046374ab085..c60ae7e1fcde 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -673,7 +673,7 @@ magic_found: } if (uspi->s_bsize < 4096) { printk("ufs_read_super: block size %u is too small\n", - uspi->s_fsize); + uspi->s_bsize); goto failed; } if (uspi->s_bsize / uspi->s_fsize > 8) { |