patch-2.1.4 linux/fs/dquot.c

Next file: linux/fs/exec.c
Previous file: linux/fs/block_dev.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/fs/dquot.c linux/fs/dquot.c
@@ -593,7 +593,7 @@
 	if (flags & QUOTA_SYSCALL) {
 		if ((error = verify_area(VERIFY_READ, dqblk, sizeof(struct dqblk))) != 0)
 			return(error);
-		memcpy_fromfs(&dq_dqblk, dqblk, sizeof(struct dqblk));
+		copy_from_user(&dq_dqblk, dqblk, sizeof(struct dqblk));
 	} else {
 		memcpy(&dq_dqblk, dqblk, sizeof(struct dqblk));
 	}
@@ -653,7 +653,7 @@
 			return(error);
 
 		if ((dquot = dqget(dev, id, type)) != NODQUOT) {
-			memcpy_tofs(dqblk, (char *)&dquot->dq_dqb, sizeof(struct dqblk));
+			copy_to_user(dqblk, (char *)&dquot->dq_dqb, sizeof(struct dqblk));
 			dqput(dquot);
 			return(0);
 		}
@@ -670,7 +670,7 @@
 
 	dqstats.allocated_dquots = nr_dquots;
 	dqstats.free_dquots = nr_free_dquots;
-	memcpy_tofs(addr, (caddr_t)&dqstats, sizeof(struct dqstats));
+	copy_to_user(addr, (caddr_t)&dqstats, sizeof(struct dqstats));
 	return(0);
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov