patch-2.1.45 linux/fs/ext2/super.c

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

diff -u --recursive --new-file v2.1.44/linux/fs/ext2/super.c linux/fs/ext2/super.c
@@ -133,9 +133,10 @@
 
 static struct super_operations ext2_sops = {
 	ext2_read_inode,
-	NULL,
 	ext2_write_inode,
 	ext2_put_inode,
+	ext2_delete_inode,
+	NULL,
 	ext2_put_super,
 	ext2_write_super,
 	ext2_statfs,
@@ -762,7 +763,7 @@
 
 #endif
 
-void ext2_statfs (struct super_block * sb, struct statfs * buf, int bufsiz)
+int ext2_statfs (struct super_block * sb, struct statfs * buf, int bufsiz)
 {
 	unsigned long overhead;
 	unsigned long overhead_per_group;
@@ -793,5 +794,5 @@
 	tmp.f_files = le32_to_cpu(sb->u.ext2_sb.s_es->s_inodes_count);
 	tmp.f_ffree = ext2_count_free_inodes (sb);
 	tmp.f_namelen = EXT2_NAME_LEN;
-	copy_to_user(buf, &tmp, bufsiz);
+	return copy_to_user(buf, &tmp, bufsiz) ? -EFAULT : 0;
 }

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