patch-2.4.0-test3 linux/fs/umsdos/inode.c

• Lines: 142
• Date: Wed Jul 5 21:38:48 2000
• Orig file: v2.4.0-test2/linux/fs/umsdos/inode.c
• Orig date: Fri Jun 23 21:55:11 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/umsdos/inode.c linux/fs/umsdos/inode.c
@@ -18,6 +18,7 @@
 #include <linux/stat.h>
 #include <linux/umsdos_fs.h>
 #include <linux/list.h>
+#include <linux/pagemap.h>
 
 extern struct dentry_operations umsdos_dentry_operations;
 
@@ -28,23 +29,6 @@
 static struct dentry *check_pseudo_root(struct super_block *);
 
 
-/*
- * Initialize a private filp
- */
-void fill_new_filp (struct file *filp, struct dentry *dentry)
-{
-	if (!dentry)
-		printk(KERN_ERR "fill_new_filp: NULL dentry!\n");
-
-	memset (filp, 0, sizeof (struct file));
-	filp->f_reada = 1;
-	filp->f_flags = O_RDWR;
-	filp->f_dentry = dentry;
-	filp->f_op = dentry->d_inode->i_fop;
-}
-
-
-
 void UMSDOS_put_inode (struct inode *inode)
 {
 	PRINTK ((KERN_DEBUG 
@@ -68,8 +52,6 @@
 	Printk ((KERN_DEBUG "UMSDOS_put_super: entering\n"));
 	if (saved_root) {
 		shrink_dcache_parent(saved_root);
-printk("UMSDOS_put_super: freeing saved root, d_count=%d\n",
-saved_root->d_count);
 		dput(saved_root);
 		saved_root = NULL;
 		pseudo_root = NULL;
@@ -202,9 +184,11 @@
 {
 	struct inode *inode = dentry->d_inode;
 	struct dentry *demd;
+	struct address_space *mapping;
+	struct page *page;
 	int ret = 0;
-	struct file filp;
-	struct umsdos_dirent entry;
+	struct umsdos_dirent *entry;
+	int offs;
 
 Printk(("UMSDOS_notify_change: entering for %s/%s (%d)\n",
 dentry->d_parent->d_name.name, dentry->d_name.name, inode->u.umsdos_i.i_patched));
@@ -237,52 +221,43 @@
 	 * See emd.c
 	 */
 
-	fill_new_filp (&filp, demd);
-	filp.f_pos = inode->u.umsdos_i.pos;
-Printk(("UMSDOS_notify_change: %s/%s reading at %d\n",
-dentry->d_parent->d_name.name, dentry->d_name.name, (int) filp.f_pos));
-
 	/* Read only the start of the entry since we don't touch the name */
-	ret = umsdos_emd_dir_read (&filp, (char *) &entry, UMSDOS_REC_SIZE);
-	if (ret) {
-		printk(KERN_WARNING
-			"umsdos_notify_change: %s/%s EMD read error, ret=%d\n",
-			dentry->d_parent->d_name.name, dentry->d_name.name,ret);
+	mapping = demd->d_inode->i_mapping;
+	offs = inode->u.umsdos_i.pos & ~PAGE_CACHE_MASK;
+	ret = -ENOMEM;
+	page=grab_cache_page(mapping,inode->u.umsdos_i.pos>>PAGE_CACHE_SHIFT);
+	if (!page)
 		goto out_dput;
-	}
+	ret=mapping->a_ops->prepare_write(NULL,page,offs,offs+UMSDOS_REC_SIZE);
+	if (ret)
+		goto out_unlock;
+	entry = (struct umsdos_dirent*)((char*)page_address(page)+offs);
 	if (attr->ia_valid & ATTR_UID)
-		entry.uid = attr->ia_uid;
+		entry->uid = cpu_to_le16(attr->ia_uid);
 	if (attr->ia_valid & ATTR_GID)
-		entry.gid = attr->ia_gid;
+		entry->gid = cpu_to_le16(attr->ia_gid);
 	if (attr->ia_valid & ATTR_MODE)
-		entry.mode = attr->ia_mode;
+		entry->mode = cpu_to_le16(attr->ia_mode);
 	if (attr->ia_valid & ATTR_ATIME)
-		entry.atime = attr->ia_atime;
+		entry->atime = cpu_to_le32(attr->ia_atime);
 	if (attr->ia_valid & ATTR_MTIME)
-		entry.mtime = attr->ia_mtime;
+		entry->mtime = cpu_to_le32(attr->ia_mtime);
 	if (attr->ia_valid & ATTR_CTIME)
-		entry.ctime = attr->ia_ctime;
-
-	entry.nlink = inode->i_nlink;
-	filp.f_pos = inode->u.umsdos_i.pos;
-	ret = umsdos_emd_dir_write (&filp, (char *) &entry, UMSDOS_REC_SIZE);
+		entry->ctime = cpu_to_le32(attr->ia_ctime);
+	entry->nlink = cpu_to_le16(inode->i_nlink);
+	ret=mapping->a_ops->commit_write(NULL,page,offs,offs+UMSDOS_REC_SIZE);
 	if (ret)
 		printk(KERN_WARNING
 			"umsdos_notify_change: %s/%s EMD write error, ret=%d\n",
 			dentry->d_parent->d_name.name, dentry->d_name.name,ret);
 
-	Printk (("notify pos %lu ret %d nlink %d ",
-		inode->u.umsdos_i.pos, ret, entry.nlink));
 	/* #Specification: notify_change / msdos fs
 	 * notify_change operation are done only on the
 	 * EMD file. The msdos fs is not even called.
 	 */
-#ifdef UMSDOS_DEBUG_VERBOSE
-if (entry.flags & UMSDOS_HIDDEN)
-printk("umsdos_notify_change: %s/%s hidden, nlink=%d, ret=%d\n",
-dentry->d_parent->d_name.name, dentry->d_name.name, entry.nlink, ret);
-#endif
-
+out_unlock:
+	UnlockPage(page);
+	page_cache_release(page);
 out_dput:
 	dput(demd);
 out:
@@ -293,11 +268,11 @@
 /*
  * Update the disk with the inode content
  */
-void UMSDOS_write_inode (struct inode *inode)
+void UMSDOS_write_inode (struct inode *inode, int wait)
 {
 	struct iattr newattrs;
 
-	fat_write_inode (inode);
+	fat_write_inode (inode, wait);
 	newattrs.ia_mtime = inode->i_mtime;
 	newattrs.ia_atime = inode->i_atime;
 	newattrs.ia_ctime = inode->i_ctime;