From 43b53c8173575ebafddb3eed853697a18af9fa64 Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Tue, 3 Nov 2009 14:56:06 -0600
Subject: [PATCH] --- yaml --- r: 179631 b: refs/heads/master c:
 38e3eaeedcac75360af8a92e7b66956ec4f334e5 h: refs/heads/master i:   179629:
 eb545a231ee2f0812c4e4a90e091efaac2ca1cc9   179627:
 c7188294f00d47428acad1ae45d4b0bab12e0cd2   179623:
 4ea3c4036c6f4300e33ae0e03b5c2d57d4a161af   179615:
 598058214715268d2a2678d4fe8ec6778faa9f98 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ecryptfs/file.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 791afa8070fd..a1f0df9fa583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8f484d1b6677dd5cd5e7e605db747e8c30bbd47
+refs/heads/master: 38e3eaeedcac75360af8a92e7b66956ec4f334e5
diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c
index 9e944057001b..3efc7fdc3c39 100644
--- a/trunk/fs/ecryptfs/file.c
+++ b/trunk/fs/ecryptfs/file.c
@@ -299,7 +299,6 @@ static int ecryptfs_ioctl(struct inode *inode, struct file *file,
 const struct file_operations ecryptfs_dir_fops = {
 	.readdir = ecryptfs_readdir,
 	.ioctl = ecryptfs_ioctl,
-	.mmap = generic_file_mmap,
 	.open = ecryptfs_open,
 	.flush = ecryptfs_flush,
 	.release = ecryptfs_release,