diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /fs/ufs | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/super.c | 6 | ||||
| -rw-r--r-- | fs/ufs/truncate.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 360291513..091a5cd6c 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -489,6 +489,12 @@ struct super_block * ufs_read_super (struct super_block * sb, void * data, if (!uspi) goto failed; + /* Set a 2Gig file limit. Some UFS variants need to override + this but as I don't know which I'll let those in the know loosen + the rules */ + + sb->s_maxbytes = MAX_NON_LFS; + switch (sb->u.ufs_sb.s_mount_opt & UFS_MOUNT_UFSTYPE) { case UFS_MOUNT_UFSTYPE_44BSD: UFSD(("ufstype=44bsd\n")) diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c index 183ccfb13..d154f58d1 100644 --- a/fs/ufs/truncate.c +++ b/fs/ufs/truncate.c @@ -160,7 +160,7 @@ next1: frag_to_free = tmp; free_count = uspi->s_fpb; } -next2: +next2:; } if (free_count > 0) @@ -261,7 +261,7 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, u32 * p) } inode->i_blocks -= uspi->s_nspb; mark_inode_dirty(inode); -next: +next:; } if (free_count > 0) { |