The patch titled
ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap fix
has been removed from the -mm tree. Its filename is
ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap fix
From: 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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff -puN fs/ecryptfs/file.c~ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap-fix fs/ecryptfs/file.c
--- devel/fs/ecryptfs/file.c~ecryptfs-vs-streamline-generic_file_-interfaces-and-filemap-fix 2006-05-18 14:48:17.000000000 -0700
+++ devel-akpm/fs/ecryptfs/file.c 2006-05-18 14:48:17.000000000 -0700
@@ -99,14 +99,23 @@ out:
* returns without any errors. This is to be used only for file reads.
* The function to be used for directory reads is ecryptfs_read.
*/
-static ssize_t ecryptfs_read_update_atime(struct file *file, char __user * buf,
- size_t count, loff_t * ppos)
+static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
+ const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
+
{
int rc;
+ struct file *file = iocb->ki_filp;
struct dentry *lower_dentry;
struct vfsmount *lower_vfsmount;
- rc = do_sync_read(file, buf, count, ppos);
+ rc = generic_file_aio_read(iocb, iov, nr_segs, pos);
+ /*
+ * Even though this is a async interface, we need to wait
+ * for IO to finish to update atime
+ */
+ if (-EIOCBQUEUED == rc)
+ rc = wait_on_sync_kiocb(iocb);
if (rc >= 0) {
lower_dentry = ecryptfs_dentry_to_lower(file->f_dentry);
lower_vfsmount = ecryptfs_superblock_to_private(
@@ -589,8 +598,10 @@ const struct file_operations ecryptfs_di
const struct file_operations ecryptfs_main_fops = {
.llseek = ecryptfs_llseek,
- .read = ecryptfs_read_update_atime,
+ .read = do_sync_read,
+ .aio_read = ecryptfs_read_update_atime,
.write = do_sync_write,
+ .aio_write = generic_file_aio_write,
.readdir = ecryptfs_readdir,
.ioctl = ecryptfs_ioctl,
.mmap = generic_file_mmap,
_
Patches currently in -mm which might be from pbadari@xxxxxxxxxx are
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
slab-reduce-numa-text-size-tidy-fix.patch
pass-io-size-to-batch_write-address-space-operation.patch
dio-centralize-completion-in-dio_complete.patch
dio-call-blk_run_address_space-once-per-op.patch
dio-formalize-bio-counters-as-a-dio-reference-count.patch
dio-remove-duplicate-bio-wait-code.patch
dio-only-call-aio_complete-after-returning-eiocbqueued.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
