From 393e582cd1bd280a10106b9789252bb09dbfc999 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 11 Mar 2009 14:37:54 -0400 Subject: [PATCH] --- yaml --- r: 139523 b: refs/heads/master c: e1ebfd33be068ec933f8954060a499bd22ad6f69 h: refs/heads/master i: 139521: d03cca2cd7198624fab958aef4719be558e39394 139519: 748b8fbd349650ee79da3fc7f28c720c22fc3805 v: v3 --- [refs] | 2 +- trunk/fs/nfs/file.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0c298e51fdd0..c0389c833b36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72cb77f4a5ace37b12dcb47a0e8637a2c28ad881 +refs/heads/master: e1ebfd33be068ec933f8954060a499bd22ad6f69 diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c index 404c19c866a7..1eab9c9ad242 100644 --- a/trunk/fs/nfs/file.c +++ b/trunk/fs/nfs/file.c @@ -64,11 +64,7 @@ const struct file_operations nfs_file_operations = { .write = do_sync_write, .aio_read = nfs_file_read, .aio_write = nfs_file_write, -#ifdef CONFIG_MMU .mmap = nfs_file_mmap, -#else - .mmap = generic_file_mmap, -#endif .open = nfs_file_open, .flush = nfs_file_flush, .release = nfs_file_release, @@ -304,11 +300,13 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma) dprintk("NFS: mmap(%s/%s)\n", dentry->d_parent->d_name.name, dentry->d_name.name); - status = nfs_revalidate_mapping(inode, file->f_mapping); + /* Note: generic_file_mmap() returns ENOSYS on nommu systems + * so we call that before revalidating the mapping + */ + status = generic_file_mmap(file, vma); if (!status) { vma->vm_ops = &nfs_file_vm_ops; - vma->vm_flags |= VM_CAN_NONLINEAR; - file_accessed(file); + status = nfs_revalidate_mapping(inode, file->f_mapping); } return status; }