diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
| commit | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (patch) | |
| tree | 422a7a49328c59053f4fb11805adb753523c2f2c /fs/minix | |
| parent | a3b90e3c6976551acbac09f5aacd736a1658aaa8 (diff) | |
Merge with Linux 2.4.0-test5-pre6.
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/inode.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index fac903800..b49626923 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -505,20 +505,6 @@ repeat: return NULL; } } - *err = -EFBIG; - - /* Check file limits.. */ - { - unsigned long limit = current->rlim[RLIMIT_FSIZE].rlim_cur; - if (limit < RLIM_INFINITY) { - limit >>= BLOCK_SIZE_BITS; - if (new_block >= limit) { - send_sig(SIGXFSZ, current, 0); - *err = -EFBIG; - return NULL; - } - } - } tmp = minix_new_block(inode); if (!tmp) { @@ -564,7 +550,6 @@ static struct buffer_head * V1_block_getblk(struct inode * inode, int tmp; unsigned short *p; struct buffer_head * result; - unsigned long limit; result = NULL; if (!bh) @@ -590,16 +575,6 @@ repeat: goto out; } } - *err = -EFBIG; - - limit = current->rlim[RLIMIT_FSIZE].rlim_cur; - if (limit < RLIM_INFINITY) { - limit >>= BLOCK_SIZE_BITS; - if (new_block >= limit) { - send_sig(SIGXFSZ, current, 0); - goto out; - } - } tmp = minix_new_block(inode); if (!tmp) @@ -741,20 +716,6 @@ repeat: return NULL; } } - *err = -EFBIG; - - /* Check file limits.. */ - { - unsigned long limit = current->rlim[RLIMIT_FSIZE].rlim_cur; - if (limit < RLIM_INFINITY) { - limit >>= BLOCK_SIZE_BITS; - if (new_block >= limit) { - send_sig(SIGXFSZ, current, 0); - *err = -EFBIG; - return NULL; - } - } - } tmp = minix_new_block(inode); if (!tmp) { @@ -800,7 +761,6 @@ static struct buffer_head * V2_block_getblk(struct inode * inode, int tmp; unsigned int *p; struct buffer_head * result; - unsigned long limit; result = NULL; if (!bh) @@ -826,16 +786,6 @@ repeat: goto out; } } - *err = -EFBIG; - - limit = current->rlim[RLIMIT_FSIZE].rlim_cur; - if (limit < RLIM_INFINITY) { - limit >>= BLOCK_SIZE_BITS; - if (new_block >= limit) { - send_sig(SIGXFSZ, current, 0); - goto out; - } - } tmp = minix_new_block(inode); if (!tmp) |