patch-2.1.128 linux/fs/smbfs/file.c
Next file: linux/fs/super.c
Previous file: linux/fs/readdir.c
Back to the patch index
Back to the overall index
- Lines: 43
- Date:
Thu Nov 12 11:49:25 1998
- Orig file:
v2.1.127/linux/fs/smbfs/file.c
- Orig date:
Wed Aug 26 11:37:43 1998
diff -u --recursive --new-file v2.1.127/linux/fs/smbfs/file.c linux/fs/smbfs/file.c
@@ -195,40 +195,15 @@
}
static int
-smb_updatepage(struct file *file, struct page *page, const char *buffer,
- unsigned long offset, unsigned int count, int sync)
+smb_updatepage(struct file *file, struct page *page, unsigned long offset, unsigned int count, int sync)
{
struct dentry *dentry = file->f_dentry;
- unsigned long page_addr = page_address(page);
- int result;
pr_debug("SMBFS: smb_updatepage(%s/%s %d@%ld, sync=%d)\n",
dentry->d_parent->d_name.name, dentry->d_name.name,
count, page->offset+offset, sync);
-#ifdef SMBFS_PARANOIA
- if (test_bit(PG_locked, &page->flags))
- printk("smb_updatepage: page already locked!\n");
-#endif
- set_bit(PG_locked, &page->flags);
- atomic_inc(&page->count);
-
- if (copy_from_user((char *) page_addr + offset, buffer, count))
- goto bad_fault;
- result = smb_writepage_sync(dentry, page, offset, count);
-out:
- free_page(page_addr);
- return result;
-
-bad_fault:
-#ifdef SMBFS_PARANOIA
-printk("smb_updatepage: fault at addr=%lu, offset=%lu, buffer=%p\n",
-page_addr, offset, buffer);
-#endif
- result = -EFAULT;
- clear_bit(PG_uptodate, &page->flags);
- smb_unlock_page(page);
- goto out;
+ return smb_writepage_sync(dentry, page, offset, count);
}
static ssize_t
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov