From patchwork Mon Nov 29 13:36:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 364152 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oATDbIIj013862 for ; Mon, 29 Nov 2010 13:37:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111Ab0K2NhC (ORCPT ); Mon, 29 Nov 2010 08:37:02 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:50854 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754057Ab0K2Ngy (ORCPT ); Mon, 29 Nov 2010 08:36:54 -0500 Received: by mail-ew0-f46.google.com with SMTP id 5so1900230ewy.19 for ; Mon, 29 Nov 2010 05:36:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=vhGeDWRsSuNBrf/BnRxAZpFTdSxcNnINlVLssjNupMw=; b=e1EeHpgiLHKmQekU7yfh8wir7NWYijpB/Obee9x+hTI6IAnsrWrfNuzRt7dDnzuQh0 0cDosB7rMVdUTDcObkSznoOWYiKCKWjYcsrtSBZi/j6ToIoeWVkZSTVZ2+nkQKtI7aXY MElVruyuoCAMLhnIKfbLrDLkv9jE9DUnvEX14= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=mZ1kzDui41qJxiKUFQRYMlFuv8wCjhn3LPmqrKKsRT03rKyeCfOT0m3Otwi22rOs9t M2ynZiD2/M7E3v0m0APrJhj07UVbh1qnGvEfEkvi6/5Ap7EGr9Y2mO1poeuVC1qjNGnI gzQEAaMIqV0gug8+trWQono+7OMy5BsCz4568= Received: by 10.213.33.14 with SMTP id f14mr480867ebd.15.1291037813834; Mon, 29 Nov 2010 05:36:53 -0800 (PST) Received: from localhost.localdomain ([95.84.39.194]) by mx.google.com with ESMTPS id v56sm5150987eeh.20.2010.11.29.05.36.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 29 Nov 2010 05:36:53 -0800 (PST) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 5/6] CIFS: Make cifs_file_map work with strict cache mode (try #3) Date: Mon, 29 Nov 2010 16:36:44 +0300 Message-Id: <1291037804-4000-4-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1291037804-4000-1-git-send-email-piastryyy@gmail.com> References: <1291037804-4000-1-git-send-email-piastryyy@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Nov 2010 13:37:19 +0000 (UTC) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index d216879..e9f2fae 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1812,14 +1812,24 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, int cifs_file_mmap(struct file *file, struct vm_area_struct *vma) { int rc, xid; + struct inode *inode = file->f_path.dentry->d_inode; + struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); xid = GetXid(); - rc = cifs_revalidate_file(file); - if (rc) { - cFYI(1, "Validation prior to mmap failed, error=%d", rc); - FreeXid(xid); - return rc; + + if (!CIFS_I(inode)->clientCanCacheRead && + (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)) + cifs_invalidate_mapping(inode); + else { + rc = cifs_revalidate_file(file); + if (rc) { + cFYI(1, "Validation prior to mmap failed, error=%d", + rc); + FreeXid(xid); + return rc; + } } + rc = generic_file_mmap(file, vma); FreeXid(xid); return rc;