patch-2.4.0-test5 linux/fs/minix/inode.c

Next file: linux/fs/msdos/namei.c
Previous file: linux/fs/jffs/jffs_fm.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/fs/minix/inode.c linux/fs/minix/inode.c
@@ -505,20 +505,6 @@
 			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 @@
 	int tmp;
 	unsigned short *p;
 	struct buffer_head * result;
-	unsigned long limit;
 
 	result = NULL;
 	if (!bh)
@@ -590,16 +575,6 @@
 			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 @@
 			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 @@
 	int tmp;
 	unsigned int *p;
 	struct buffer_head * result;
-	unsigned long limit;
 
 	result = NULL;
 	if (!bh)
@@ -823,16 +783,6 @@
 			goto repeat;
 		} else {
 			*phys = tmp;
-			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;
 		}
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)