patch-2.1.4 linux/fs/super.c

Next file: linux/fs/sysv/file.c
Previous file: linux/fs/stat.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/fs/super.c linux/fs/super.c
@@ -224,7 +224,7 @@
 	err = verify_area(VERIFY_WRITE, buf, len);
 	if (err)
 		return err;
-	memcpy_tofs(buf, tmp->name, len);
+	copy_to_user(buf, tmp->name, len);
 	return 0;
 }
 
@@ -275,6 +275,7 @@
 	{ MS_NOSUID, ",nosuid" },
 	{ MS_NODEV, ",nodev" },
 	{ MS_SYNCHRONOUS, ",sync" },
+	{ MS_MANDLOCK, ",mand" },
 #ifdef MS_NOSUB			/* Can't find this except in mount.c */
 	{ MS_NOSUB, ",nosub" },
 #endif
@@ -495,7 +496,7 @@
         tmp.f_tfree = sbuf.f_bfree;
         tmp.f_tinode = sbuf.f_ffree;
 
-        memcpy_tofs(ubuf,&tmp,sizeof(struct ustat));
+        copy_to_user(ubuf,&tmp,sizeof(struct ustat));
         return 0;
 }
 
@@ -805,7 +806,7 @@
 	if (!(page = __get_free_page(GFP_KERNEL))) {
 		return -ENOMEM;
 	}
-	memcpy_fromfs((void *) page,data,i);
+	copy_from_user((void *) page,data,i);
 	*where = page;
 	return 0;
 }

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