From patchwork Thu May 20 07:21:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 101145 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4K7QAZ8005532 for ; Thu, 20 May 2010 07:26:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754147Ab0ETH0J (ORCPT ); Thu, 20 May 2010 03:26:09 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:60231 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753914Ab0ETH0G (ORCPT ); Thu, 20 May 2010 03:26:06 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 68EDF170148; Thu, 20 May 2010 15:26:02 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o4K7NxsX016210; Thu, 20 May 2010 15:24:00 +0800 Received: from [127.0.0.1] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id C4D4A10C0A1; Thu, 20 May 2010 15:29:37 +0800 (CST) Message-ID: <4BF4E30E.3070402@cn.fujitsu.com> Date: Thu, 20 May 2010 15:21:50 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Chris Mason CC: Linux Btrfs Subject: [PATCH 06/10] btrfs: fix remap_file_pages error Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 20 May 2010 07:26:10 +0000 (UTC) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index d146dde..c874833 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1150,8 +1150,15 @@ static const struct vm_operations_struct btrfs_file_vm_ops = { static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma) { - vma->vm_ops = &btrfs_file_vm_ops; + struct address_space *mapping = filp->f_mapping; + + if (!mapping->a_ops->readpage) + return -ENOEXEC; + file_accessed(filp); + vma->vm_ops = &btrfs_file_vm_ops; + vma->vm_flags |= VM_CAN_NONLINEAR; + return 0; }