From patchwork Wed Nov 10 15:41:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 314542 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 oAAFgYqZ031219 for ; Wed, 10 Nov 2010 15:42:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756726Ab0KJPmj (ORCPT ); Wed, 10 Nov 2010 10:42:39 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:43638 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756722Ab0KJPmi (ORCPT ); Wed, 10 Nov 2010 10:42:38 -0500 Received: by eye27 with SMTP id 27so381152eye.19 for ; Wed, 10 Nov 2010 07:42:37 -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=AfCEoRbj7uU0dCkBnWwZdmgorbk10vsSWElxAqOZdJI=; b=BLjDk2k3VrJ2DvV+V+G70Wdb08nOJQKjb1+lbiGq+5aGzVFr8XpKaYN3htHlcv2bHO NKUWmP01STFlqXWBjVcV8bA7rGttiuL3ULQ8DEi906bL51WOy42TOK4vFMOAbckMAEGj 0HpEVPzCYw6I0IdjSHMLpUuvJgjiG5b09n37k= 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=t+8v8HuAaz/CKiJ9PuzjIaOY5T5PLgIvc5fNw0LOkTySBvyFKiAcFjafUF/02xgq+z cRv0BtLDM5HSicHQSxN9gzN/kPvLuwbwAayoZXPYw9ONnrV86MysqbIyBEa/uc0pyq9a 4zeG4leB621tWegy/crHkMLKZ+jZi63HWG/bQ= Received: by 10.14.127.66 with SMTP id c42mr1213659eei.9.1289403757364; Wed, 10 Nov 2010 07:42:37 -0800 (PST) Received: from localhost.localdomain ([79.126.90.150]) by mx.google.com with ESMTPS id w20sm815303eeh.0.2010.11.10.07.42.35 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Nov 2010 07:42:36 -0800 (PST) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 4/6] CIFS: Make cifs_fsync work with strict cache mode Date: Wed, 10 Nov 2010 18:41:49 +0300 Message-Id: <1289403711-12965-5-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1289403711-12965-1-git-send-email-piastryyy@gmail.com> References: <1289403711-12965-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]); Wed, 10 Nov 2010 15:42:39 +0000 (UTC) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 568e93f..63fb551 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1611,20 +1611,20 @@ int cifs_fsync(struct file *file, int datasync) struct cifsTconInfo *tcon; struct cifsFileInfo *smbfile = file->private_data; struct inode *inode = file->f_path.dentry->d_inode; + struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); xid = GetXid(); cFYI(1, "Sync file - name: %s datasync: 0x%x", file->f_path.dentry->d_name.name, datasync); - rc = filemap_write_and_wait(inode->i_mapping); - if (rc == 0) { - struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); + if (!CIFS_I(inode)->clientCanCacheRead && + (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)) + invalidate_remote_inode(inode); - tcon = tlink_tcon(smbfile->tlink); - if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) - rc = CIFSSMBFlush(xid, tcon, smbfile->netfid); - } + tcon = tlink_tcon(smbfile->tlink); + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) + rc = CIFSSMBFlush(xid, tcon, smbfile->netfid); FreeXid(xid); return rc;