Whamcloud - gitweb
LU-3409 llite: silence lockdep warning in ll_md_blocking_ast
[fs/lustre-release.git] / lustre / llite / llite_mmap.c
index 52a8970..febad1d 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-//#include <lustre_mdc.h>
 #include <lustre_lite.h>
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 
-#define VMA_DEBUG(vma, fmt, arg...)                                     \
-        CDEBUG(D_MMAP, "vma(%p) start(%ld) end(%ld) pgoff(%ld) inode(%p) "   \
-               "ino(%lu) iname(%s): " fmt, vma, vma->vm_start, vma->vm_end,  \
-               vma->vm_pgoff, vma->vm_file->f_dentry->d_inode,               \
-               vma->vm_file->f_dentry->d_inode->i_ino,                       \
-               vma->vm_file->f_dentry->d_iname, ## arg);                     \
-
 struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
                        int *type);
 
+static struct vm_operations_struct ll_file_vm_ops;
+
 void policy_from_vma(ldlm_policy_data_t *policy,
                             struct vm_area_struct *vma, unsigned long addr,
                             size_t count)
@@ -82,30 +70,201 @@ void policy_from_vma(ldlm_policy_data_t *policy,
                                ~CFS_PAGE_MASK;
 }
 
-struct vm_area_struct * our_vma(unsigned long addr, size_t count)
+struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
+                               size_t count)
 {
-        struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma, *ret = NULL;
         ENTRY;
 
-        /* No MM (e.g. NFS)? No vmas too. */
-        if (!mm)
-                RETURN(NULL);
+        /* mmap_sem must have been held by caller. */
+        LASSERT(!down_write_trylock(&mm->mmap_sem));
 
-        spin_lock(&mm->page_table_lock);
         for(vma = find_vma(mm, addr);
             vma != NULL && vma->vm_start < (addr + count); vma = vma->vm_next) {
-                if (vma->vm_ops && vma->vm_ops->nopage == ll_nopage &&
+                if (vma->vm_ops && vma->vm_ops == &ll_file_vm_ops &&
                     vma->vm_flags & VM_SHARED) {
                         ret = vma;
                         break;
                 }
         }
-        spin_unlock(&mm->page_table_lock);
         RETURN(ret);
 }
 
 /**
+ * API independent part for page fault initialization.
+ * \param vma - virtual memory area addressed to page fault
+ * \param env - corespondent lu_env to processing
+ * \param nest - nested level
+ * \param index - page index corespondent to fault.
+ * \parm ra_flags - vma readahead flags.
+ *
+ * \return allocated and initialized env for fault operation.
+ * \retval EINVAL if env can't allocated
+ * \return other error codes from cl_io_init.
+ */
+struct cl_io *ll_fault_io_init(struct vm_area_struct *vma,
+                               struct lu_env **env_ret,
+                               struct cl_env_nest *nest,
+                               pgoff_t index, unsigned long *ra_flags)
+{
+        struct file       *file  = vma->vm_file;
+        struct inode      *inode = file->f_dentry->d_inode;
+        struct cl_io      *io;
+        struct cl_fault_io *fio;
+        struct lu_env     *env;
+        ENTRY;
+
+        *env_ret = NULL;
+        if (ll_file_nolock(file))
+                RETURN(ERR_PTR(-EOPNOTSUPP));
+
+        /*
+         * page fault can be called when lustre IO is
+         * already active for the current thread, e.g., when doing read/write
+         * against user level buffer mapped from Lustre buffer. To avoid
+         * stomping on existing context, optionally force an allocation of a new
+         * one.
+         */
+        env = cl_env_nested_get(nest);
+        if (IS_ERR(env))
+                 RETURN(ERR_PTR(-EINVAL));
+
+        *env_ret = env;
+
+        io = ccc_env_thread_io(env);
+        io->ci_obj = ll_i2info(inode)->lli_clob;
+        LASSERT(io->ci_obj != NULL);
+
+        fio = &io->u.ci_fault;
+        fio->ft_index      = index;
+        fio->ft_executable = vma->vm_flags&VM_EXEC;
+
+        /*
+         * disable VM_SEQ_READ and use VM_RAND_READ to make sure that
+         * the kernel will not read other pages not covered by ldlm in
+         * filemap_nopage. we do our readahead in ll_readpage.
+         */
+        if (ra_flags != NULL)
+                *ra_flags = vma->vm_flags & (VM_RAND_READ|VM_SEQ_READ);
+        vma->vm_flags &= ~VM_SEQ_READ;
+        vma->vm_flags |= VM_RAND_READ;
+
+        CDEBUG(D_MMAP, "vm_flags: %lx (%lu %d)\n", vma->vm_flags,
+               fio->ft_index, fio->ft_executable);
+
+        if (cl_io_init(env, io, CIT_FAULT, io->ci_obj) == 0) {
+                struct ccc_io *cio = ccc_env_io(env);
+                struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
+
+                LASSERT(cio->cui_cl.cis_io == io);
+
+                /* mmap lock must be MANDATORY
+                 * it has to cache pages. */
+                io->ci_lockreq = CILR_MANDATORY;
+
+                cio->cui_fd  = fd;
+        }
+
+        return io;
+}
+
+/* Sharing code of page_mkwrite method for rhel5 and rhel6 */
+static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,
+                            bool *retry)
+{
+       struct lu_env           *env;
+       struct cl_io            *io;
+       struct vvp_io           *vio;
+       struct cl_env_nest       nest;
+       int                      result;
+       cfs_sigset_t             set;
+       struct inode             *inode;
+       struct ll_inode_info     *lli;
+       ENTRY;
+
+       LASSERT(vmpage != NULL);
+
+       io = ll_fault_io_init(vma, &env,  &nest, vmpage->index, NULL);
+       if (IS_ERR(io))
+               GOTO(out, result = PTR_ERR(io));
+
+       result = io->ci_result;
+       if (result < 0)
+               GOTO(out, result);
+
+       io->u.ci_fault.ft_mkwrite = 1;
+       io->u.ci_fault.ft_writable = 1;
+
+       vio = vvp_env_io(env);
+       vio->u.fault.ft_vma    = vma;
+       vio->u.fault.ft_vmpage = vmpage;
+
+       set = cfs_block_sigsinv(sigmask(SIGKILL) | sigmask(SIGTERM));
+
+       /* we grab lli_trunc_sem to exclude truncate case.
+        * Otherwise, we could add dirty pages into osc cache
+        * while truncate is on-going. */
+       inode = ccc_object_inode(io->ci_obj);
+       lli = ll_i2info(inode);
+       down_read(&lli->lli_trunc_sem);
+
+       result = cl_io_loop(env, io);
+
+       up_read(&lli->lli_trunc_sem);
+
+       cfs_restore_sigs(set);
+
+        if (result == 0) {
+               struct inode *inode = vma->vm_file->f_dentry->d_inode;
+               struct ll_inode_info *lli = ll_i2info(inode);
+
+                lock_page(vmpage);
+                if (vmpage->mapping == NULL) {
+                        unlock_page(vmpage);
+
+                        /* page was truncated and lock was cancelled, return
+                         * ENODATA so that VM_FAULT_NOPAGE will be returned
+                         * to handle_mm_fault(). */
+                        if (result == 0)
+                                result = -ENODATA;
+                } else if (!PageDirty(vmpage)) {
+                        /* race, the page has been cleaned by ptlrpcd after
+                         * it was unlocked, it has to be added into dirty
+                         * cache again otherwise this soon-to-dirty page won't
+                         * consume any grants, even worse if this page is being
+                         * transferred because it will break RPC checksum.
+                         */
+                        unlock_page(vmpage);
+
+                        CDEBUG(D_MMAP, "Race on page_mkwrite %p/%lu, page has "
+                               "been written out, retry.\n",
+                               vmpage, vmpage->index);
+
+                        *retry = true;
+                        result = -EAGAIN;
+                }
+
+               if (result == 0) {
+                       spin_lock(&lli->lli_lock);
+                       lli->lli_flags |= LLIF_DATA_MODIFIED;
+                       spin_unlock(&lli->lli_lock);
+               }
+        }
+        EXIT;
+
+out:
+        cl_io_fini(env, io);
+        cl_env_nested_put(&nest, env);
+
+        CDEBUG(D_MMAP, "%s mkwrite with %d\n", cfs_current()->comm, result);
+
+        LASSERT(ergo(result == 0, PageLocked(vmpage)));
+        return(result);
+}
+
+
+#ifndef HAVE_VM_OP_FAULT
+/**
  * Lustre implementation of a vm_operations_struct::nopage() method, called by
  * VM to server page fault (both in kernel and user space).
  *
@@ -115,103 +274,256 @@ struct vm_area_struct * our_vma(unsigned long addr, size_t count)
  * \param address - address when hit fault
  * \param type - of fault
  *
- * XXX newer 2.6 kernels provide vm_operations_struct::fault() method with
- * slightly different semantics instead.
- *
- * \return allocated and filled page for address
+ * \return allocated and filled _unlocked_ page for address
  * \retval NOPAGE_SIGBUS if page not exist on this address
  * \retval NOPAGE_OOM not have memory for allocate new page
  */
 struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
                        int *type)
 {
-        struct file       *file  = vma->vm_file;
-        struct inode      *inode = file->f_dentry->d_inode;
-        struct lu_env     *env;
-        struct cl_io      *io;
-        struct page       *page  = NULL;
-        struct cl_env_nest nest;
-        int result;
+        struct lu_env           *env;
+        struct cl_env_nest      nest;
+        struct cl_io            *io;
+        struct page             *page  = NOPAGE_SIGBUS;
+        struct vvp_io           *vio = NULL;
+        unsigned long           ra_flags;
+        pgoff_t                 pg_offset;
+        int                     result;
+        const unsigned long     writable = VM_SHARED|VM_WRITE;
+       cfs_sigset_t            set;
+        ENTRY;
+
+        pg_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+        io = ll_fault_io_init(vma, &env,  &nest, pg_offset, &ra_flags);
+        if (IS_ERR(io))
+                return NOPAGE_SIGBUS;
+
+        result = io->ci_result;
+        if (result < 0)
+                goto out_err;
+
+        io->u.ci_fault.ft_writable = (vma->vm_flags&writable) == writable;
 
+        vio = vvp_env_io(env);
+        vio->u.fault.ft_vma            = vma;
+        vio->u.fault.nopage.ft_address = address;
+        vio->u.fault.nopage.ft_type    = type;
+        vio->u.fault.ft_vmpage         = NULL;
+
+       set = cfs_block_sigsinv(sigmask(SIGKILL)|sigmask(SIGTERM));
+       result = cl_io_loop(env, io);
+       cfs_restore_sigs(set);
+
+       page = vio->u.fault.ft_vmpage;
+       if (result != 0 && page != NULL) {
+               page_cache_release(page);
+               page = NOPAGE_SIGBUS;
+       }
+
+out_err:
+        if (result == -ENOMEM)
+                page = NOPAGE_OOM;
+
+        vma->vm_flags &= ~VM_RAND_READ;
+        vma->vm_flags |= ra_flags;
+
+        cl_io_fini(env, io);
+        cl_env_nested_put(&nest, env);
+
+        RETURN(page);
+}
+
+#else
+
+static inline int to_fault_error(int result)
+{
+       switch(result) {
+       case 0:
+               result = VM_FAULT_LOCKED;
+               break;
+       case -EFAULT:
+               result = VM_FAULT_NOPAGE;
+               break;
+       case -ENOMEM:
+               result = VM_FAULT_OOM;
+               break;
+       default:
+               result = VM_FAULT_SIGBUS;
+               break;
+       }
+       return result;
+}
+
+/**
+ * Lustre implementation of a vm_operations_struct::fault() method, called by
+ * VM to server page fault (both in kernel and user space).
+ *
+ * \param vma - is virtiual area struct related to page fault
+ * \param vmf - structure which describe type and address where hit fault
+ *
+ * \return allocated and filled _locked_ page for address
+ * \retval VM_FAULT_ERROR on general error
+ * \retval NOPAGE_OOM not have memory for allocate new page
+ */
+static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        struct lu_env           *env;
+        struct cl_io            *io;
+        struct vvp_io           *vio = NULL;
+        struct page             *vmpage;
+        unsigned long            ra_flags;
+        struct cl_env_nest       nest;
+        int                      result;
+        int                      fault_ret = 0;
         ENTRY;
 
-        /*
-         * vm_operations_struct::nopage() can be called when lustre IO is
-         * already active for the current thread, e.g., when doing read/write
-         * against user level buffer mapped from Lustre buffer. To avoid
-         * stomping on existing context, optionally force an allocation of a new
-         * one.
-         */
-        env = cl_env_nested_get(&nest);
-        if (!IS_ERR(env)) {
-                pgoff_t pg_offset;
-                const unsigned long writable = VM_SHARED|VM_WRITE;
-                unsigned long ra_flags;
-                struct cl_fault_io *fio;
-
-                io = &ccc_env_info(env)->cti_io;
-                memset(io, 0, sizeof(*io));
-                io->ci_obj = ll_i2info(inode)->lli_clob;
-                LASSERT(io->ci_obj != NULL);
-
-                fio = &io->u.ci_fault;
-                pg_offset = (address - vma->vm_start) >> PAGE_SHIFT;
-                fio->ft_index      = pg_offset + vma->vm_pgoff;
-                fio->ft_writable   = (vma->vm_flags&writable) == writable;
-                fio->ft_executable = vma->vm_flags&VM_EXEC;
-
-                /*
-                 * disable VM_SEQ_READ and use VM_RAND_READ to make sure that
-                 * the kernel will not read other pages not covered by ldlm in
-                 * filemap_nopage. we do our readahead in ll_readpage.
-                 */
-                ra_flags = vma->vm_flags & (VM_RAND_READ|VM_SEQ_READ);
-                vma->vm_flags &= ~VM_SEQ_READ;
-                vma->vm_flags |= VM_RAND_READ;
-
-                CDEBUG(D_INFO, "vm_flags: %lx (%lu %i %i)\n", vma->vm_flags,
-                       fio->ft_index, fio->ft_writable, fio->ft_executable);
-
-                if (cl_io_init(env, io, CIT_FAULT, io->ci_obj) == 0) {
-                        struct vvp_io *vio = vvp_env_io(env);
-                        struct ccc_io *cio = ccc_env_io(env);
-                        struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
-                        struct ll_sb_info *sbi  = ll_i2sbi(inode);
-
-                        LASSERT(cio->cui_cl.cis_io == io);
-
-                        /* mmap lock should be MANDATORY or NEVER. */
-                        if (fd->fd_flags & LL_FILE_IGNORE_LOCK ||
-                            sbi->ll_flags & LL_SBI_NOLCK)
-                                io->ci_lockreq = CILR_NEVER;
-                        else
-                                io->ci_lockreq = CILR_MANDATORY;
-
-                        vio->u.fault.ft_vma     = vma;
-                        vio->u.fault.ft_address = address;
-                        vio->u.fault.ft_type    = type;
-                        cio->cui_fd             = fd;
-
-                        result = cl_io_loop(env, io);
-                        if (result == 0) {
-                                LASSERT(fio->ft_page != NULL);
-                                page = cl_page_vmpage(env, fio->ft_page);
-                        } else if (result == -EFAULT) {
-                                page = NOPAGE_SIGBUS;
-                        } else if (result == -ENOMEM) {
-                                page = NOPAGE_OOM;
+        io = ll_fault_io_init(vma, &env,  &nest, vmf->pgoff, &ra_flags);
+        if (IS_ERR(io))
+               RETURN(to_fault_error(PTR_ERR(io)));
+
+        result = io->ci_result;
+       if (result == 0) {
+               vio = vvp_env_io(env);
+               vio->u.fault.ft_vma       = vma;
+               vio->u.fault.ft_vmpage    = NULL;
+               vio->u.fault.fault.ft_vmf = vmf;
+
+               result = cl_io_loop(env, io);
+
+               fault_ret = vio->u.fault.fault.ft_flags;
+               vmpage = vio->u.fault.ft_vmpage;
+               if (result != 0 && vmpage != NULL) {
+                       page_cache_release(vmpage);
+                       vmf->page = NULL;
+               }
+        }
+        cl_io_fini(env, io);
+        cl_env_nested_put(&nest, env);
+
+       vma->vm_flags |= ra_flags;
+       if (result != 0 && !(fault_ret & VM_FAULT_RETRY))
+               fault_ret |= to_fault_error(result);
+
+        CDEBUG(D_MMAP, "%s fault %d/%d\n",
+               cfs_current()->comm, fault_ret, result);
+        RETURN(fault_ret);
+}
+
+static int ll_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+       int count = 0;
+       bool printed = false;
+       int result;
+       cfs_sigset_t set;
+
+       /* Only SIGKILL and SIGTERM is allowed for fault/nopage/mkwrite
+        * so that it can be killed by admin but not cause segfault by
+        * other signals. */
+       set = cfs_block_sigsinv(sigmask(SIGKILL) | sigmask(SIGTERM));
+
+restart:
+        result = ll_fault0(vma, vmf);
+        LASSERT(!(result & VM_FAULT_LOCKED));
+        if (result == 0) {
+                struct page *vmpage = vmf->page;
+
+                /* check if this page has been truncated */
+                lock_page(vmpage);
+                if (unlikely(vmpage->mapping == NULL)) { /* unlucky */
+                        unlock_page(vmpage);
+                        page_cache_release(vmpage);
+                        vmf->page = NULL;
+
+                        if (!printed && ++count > 16) {
+                                CWARN("the page is under heavy contention,"
+                                      "maybe your app(%s) needs revising :-)\n",
+                                      current->comm);
+                                printed = true;
                         }
-                } else
-                        result = io->ci_result;
 
-                vma->vm_flags &= ~VM_RAND_READ;
-                vma->vm_flags |= ra_flags;
+                        goto restart;
+                }
 
-                cl_io_fini(env, io);
-                cl_env_nested_put(&nest, env);
+                result |= VM_FAULT_LOCKED;
         }
-        RETURN(page);
+       cfs_restore_sigs(set);
+        return result;
 }
+#endif
+
+#ifndef HAVE_PGMKWRITE_USE_VMFAULT
+static int ll_page_mkwrite(struct vm_area_struct *vma, struct page *vmpage)
+{
+        int count = 0;
+        bool printed = false;
+        bool retry;
+        int result;
+
+        do {
+                retry = false;
+                result = ll_page_mkwrite0(vma, vmpage, &retry);
+
+                if (!printed && ++count > 16) {
+                        CWARN("app(%s): the page %lu of file %lu is under heavy"
+                              " contention.\n",
+                              current->comm, page_index(vmpage),
+                              vma->vm_file->f_dentry->d_inode->i_ino);
+                        printed = true;
+                }
+        } while (retry);
+
+        if (result == 0)
+                unlock_page(vmpage);
+        else if (result == -ENODATA)
+                result = 0; /* kernel will know truncate has happened and
+                             * retry */
+
+        return result;
+}
+#else
+static int ll_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        int count = 0;
+        bool printed = false;
+        bool retry;
+        int result;
+
+        do {
+                retry = false;
+                result = ll_page_mkwrite0(vma, vmf->page, &retry);
+
+                if (!printed && ++count > 16) {
+                        CWARN("app(%s): the page %lu of file %lu is under heavy"
+                              " contention.\n",
+                              current->comm, vmf->pgoff,
+                              vma->vm_file->f_dentry->d_inode->i_ino);
+                        printed = true;
+                }
+        } while (retry);
+
+        switch(result) {
+        case 0:
+                LASSERT(PageLocked(vmf->page));
+                result = VM_FAULT_LOCKED;
+                break;
+        case -ENODATA:
+        case -EFAULT:
+                result = VM_FAULT_NOPAGE;
+                break;
+        case -ENOMEM:
+                result = VM_FAULT_OOM;
+                break;
+        case -EAGAIN:
+                result = VM_FAULT_RETRY;
+                break;
+        default:
+                result = VM_FAULT_SIGBUS;
+                break;
+        }
+
+        return result;
+}
+#endif
 
 /**
  *  To avoid cancel the locks covering mmapped region for lock cache pressure,
@@ -224,8 +536,8 @@ static void ll_vm_open(struct vm_area_struct * vma)
 
         ENTRY;
         LASSERT(vma->vm_file);
-        LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
-        atomic_inc(&vob->cob_mmap_cnt);
+        LASSERT(cfs_atomic_read(&vob->cob_mmap_cnt) >= 0);
+        cfs_atomic_inc(&vob->cob_mmap_cnt);
         EXIT;
 }
 
@@ -239,11 +551,12 @@ static void ll_vm_close(struct vm_area_struct *vma)
 
         ENTRY;
         LASSERT(vma->vm_file);
-        atomic_dec(&vob->cob_mmap_cnt);
-        LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
+        cfs_atomic_dec(&vob->cob_mmap_cnt);
+        LASSERT(cfs_atomic_read(&vob->cob_mmap_cnt) >= 0);
         EXIT;
 }
 
+#ifndef HAVE_VM_OP_FAULT
 #ifndef HAVE_FILEMAP_POPULATE
 static int (*filemap_populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
 #endif
@@ -258,6 +571,7 @@ static int ll_populate(struct vm_area_struct *area, unsigned long address,
         rc = filemap_populate(area, address, len, prot, pgoff, 1);
         RETURN(rc);
 }
+#endif
 
 /* return the user space pointer that maps to a file offset via a vma */
 static inline unsigned long file_to_user(struct vm_area_struct *vma, __u64 byte)
@@ -284,28 +598,41 @@ int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last)
 }
 
 static struct vm_operations_struct ll_file_vm_ops = {
-        .nopage         = ll_nopage,
-        .open           = ll_vm_open,
-        .close          = ll_vm_close,
-        .populate       = ll_populate,
+#ifndef HAVE_VM_OP_FAULT
+       .nopage                 = ll_nopage,
+       .populate               = ll_populate,
+#else
+       .fault                  = ll_fault,
+#endif
+#ifndef HAVE_PGMKWRITE_COMPACT
+       .page_mkwrite           = ll_page_mkwrite,
+#else
+       ._pmkw.page_mkwrite     = ll_page_mkwrite,
+#endif
+       .open                   = ll_vm_open,
+       .close                  = ll_vm_close,
 };
 
-int ll_file_mmap(struct file * file, struct vm_area_struct * vma)
+int ll_file_mmap(struct file *file, struct vm_area_struct * vma)
 {
+        struct inode *inode = file->f_dentry->d_inode;
         int rc;
         ENTRY;
 
-        ll_stats_ops_tally(ll_i2sbi(file->f_dentry->d_inode), LPROC_LL_MAP, 1);
+        if (ll_file_nolock(file))
+                RETURN(-EOPNOTSUPP);
+
+        ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_MAP, 1);
         rc = generic_file_mmap(file, vma);
         if (rc == 0) {
-#if !defined(HAVE_FILEMAP_POPULATE)
+#if !defined(HAVE_FILEMAP_POPULATE) && !defined(HAVE_VM_OP_FAULT)
                 if (!filemap_populate)
                         filemap_populate = vma->vm_ops->populate;
 #endif
                 vma->vm_ops = &ll_file_vm_ops;
                 vma->vm_ops->open(vma);
                 /* update the inode's size and mtime */
-                rc = cl_glimpse_size(file->f_dentry->d_inode);
+                rc = ll_glimpse_size(inode);
         }
 
         RETURN(rc);