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

Next file: linux/fs/ext2/super.c
Previous file: linux/fs/ext2/file.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/fs/ext2/inode.c linux/fs/ext2/inode.c
@@ -223,20 +223,6 @@
 			return NULL;
 		}
 	}
-	*err = -EFBIG;
-
-	/* Check file limits.. */
-	{
-		unsigned long limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
-		if (limit < RLIM_INFINITY) {
-			limit >>= EXT2_BLOCK_SIZE_BITS(inode->i_sb);
-			if (new_block >= limit) {
-				send_sig(SIGXFSZ, current, 0);
-				*err = -EFBIG;
-				return NULL;
-			}
-		}
-	}
 
 	if (inode->u.ext2_i.i_next_alloc_block == new_block)
 		goal = inode->u.ext2_i.i_next_alloc_goal;
@@ -259,10 +245,9 @@
 	ext2_debug ("goal = %d.\n", goal);
 
 	tmp = ext2_alloc_block (inode, goal, err);
-	if (!tmp) {
-		*err = -ENOSPC;
+	if (!tmp)
 		return NULL;
-	}
+
 	if (metadata) {
 		result = getblk (inode->i_dev, tmp, blocksize);
 		if (!buffer_uptodate(result))
@@ -321,7 +306,6 @@
 	u32 * p;
 	struct buffer_head * result;
 	int blocksize = inode->i_sb->s_blocksize;
-	unsigned long limit;
 
 	result = NULL;	
 	if (!bh)
@@ -345,16 +329,6 @@
 		} else {
 			*phys = tmp;
 			/* result == NULL */
-			goto out;
-		}
-	}
-	*err = -EFBIG;
-
-	limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
-	if (limit < RLIM_INFINITY) {
-		limit >>= EXT2_BLOCK_SIZE_BITS(inode->i_sb);
-		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)