The patch titled ecryptfs vs streamline-generic_file_-interfaces-and-filemap has been removed from the -mm tree. Its filename is ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: ecryptfs vs streamline-generic_file_-interfaces-and-filemap From: Andrew Morton <akpm@xxxxxxxx> This is probably wrong. (But less wrong than the first version) Cc: Badari Pulavarty <pbadari@xxxxxxxxxx> Cc: Phillip Hellewell <phillip@xxxxxxxxxxxxxxxxxxxx> Cc: Michael Halcrow <mhalcrow@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/ecryptfs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN fs/ecryptfs/file.c~ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap fs/ecryptfs/file.c --- devel/fs/ecryptfs/file.c~ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap 2006-05-17 14:02:11.000000000 -0700 +++ devel-akpm/fs/ecryptfs/file.c 2006-05-17 14:02:11.000000000 -0700 @@ -106,7 +106,7 @@ static ssize_t ecryptfs_read_update_atim struct dentry *lower_dentry; struct vfsmount *lower_vfsmount; - rc = generic_file_read(file, buf, count, ppos); + rc = do_sync_read(file, buf, count, ppos); if (rc >= 0) { lower_dentry = ecryptfs_dentry_to_lower(file->f_dentry); lower_vfsmount = ecryptfs_superblock_to_private( @@ -590,7 +590,7 @@ const struct file_operations ecryptfs_di const struct file_operations ecryptfs_main_fops = { .llseek = ecryptfs_llseek, .read = ecryptfs_read_update_atime, - .write = generic_file_write, + .write = do_sync_write, .readdir = ecryptfs_readdir, .ioctl = ecryptfs_ioctl, .mmap = generic_file_mmap, _ Patches currently in -mm which might be from akpm@xxxxxxxx are git-acpi.patch acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch acpi-asus-s3-resume-fix.patch sony_apci-resume.patch git-audit-master-fixup.patch kauditd_thread-warning-fix.patch git-cifs-fixup.patch git-geode-fixup.patch revert-input-make-input_openclose_device-more-robust.patch libata-return-sense-data-in-hdio_drive_cmd-ioctl-tidy.patch forcedeth-power-management-support-tidy.patch drivers-net-ns83820c-add-paramter-to-disable-auto.patch git-pcmcia-fixup.patch git-serial-fixup.patch pci-optionally-sort-device-lists-breadth-first-tweaks.patch pci-optionally-sort-device-lists-breadth-first-force-on.patch git-scsi-target-fixup.patch git-scsi-target-vs-git-block.patch xpad-dance-pad-support-tidy.patch git-watchdog.patch x86_64-dump_trace-atomicity-fix.patch spinlock-debug-all-cpu-backtrace.patch spinlock-debug-all-cpu-backtrace-fix.patch spinlock-debug-all-cpu-backtrace-fix-2.patch spinlock-debug-all-cpu-backtrace-fix-3.patch xfs-rename-uio_read.patch get-rid-of-zone_table.patch slab-reduce-numa-text-size-tidy.patch swap-token-new-scheme-to-preempt-token-tidy.patch radix-tree-rcu-lockless-readside.patch acx1xx-wireless-driver.patch swsusp-add-resume_offset-command-line-parameter-rev-2.patch deprecate-smbfs-in-favour-of-cifs.patch edac-new-opteron-athlon64-memory-controller-driver.patch add-address_space_operationsbatch_write.patch add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch kbuild-dont-put-temp-files-in-the-source-tree.patch generic-implementatation-of-bug.patch generic-implementatation-of-bug-fix.patch generic-bug-for-i386.patch generic-bug-for-x86-64.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching-12-fix.patch swap_prefetch-vs-zoned-counters.patch readahead-sysctl-parameters-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch make-kmem_cache_destroy-return-void-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch reiser4-get_sb_dev-fix.patch reiser4-vs-zoned-allocator.patch reiser4-rename-generic_sounding_globalspatch-fix.patch hpt3xx-rework-rate-filtering-tidy.patch gtod-persistent-clock-support-i386-update-fix.patch hrtimers-state-tracking-fix.patch clockevents-drivers-for-i386-fix.patch debugging-feature-timer-stats-fix.patch kevent-core-files-fix.patch kevent-core-files-s390-hack.patch kevent-socket-notifications-fix-2.patch kevent-socket-notifications-fix-4.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.patch restore-rogue-readahead-printk.patch put_bh-debug.patch acpi_format_exception-debug.patch jmicron-warning-fix.patch squash-ipc-warnings.patch squash-transmeta-warnings.patch squash-udf-warnings.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html