From patchwork Tue Nov 2 19:44:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 297972 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 oA2JivSg026013 for ; Tue, 2 Nov 2010 19:45:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755183Ab0KBTo7 (ORCPT ); Tue, 2 Nov 2010 15:44:59 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:54423 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755106Ab0KBTo7 (ORCPT ); Tue, 2 Nov 2010 15:44:59 -0400 Received: by eye27 with SMTP id 27so4167879eye.19 for ; Tue, 02 Nov 2010 12:44:58 -0700 (PDT) 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=2bT2W15i+Rr4seWnBT7g8nPudNIdZ7uicYqjnTUZ/2k=; b=irMBO+wdWmI1zYb18AfTPdsPtM1vRMlJ+RSlHQthHUh4v4+DM2upbQ4dnnZ2JX2NCV ZT6oxDn+JJXLdBgfi04zy3LODl2qR+N0ufGZK4PAQvdpDcaoaiNahyaa9+IudQylcD8r JSJUeap1HbOym/ZzUyQt4ngD8saRqu4J55Y9g= 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=VqyHc9AjGx4Bul4nZG7rgEuDTNFPxmy7cJCjZLFKj8Vmzy+SvFpoRbdE2EyvA/E8DO GSTWYkRfd2WlZN/1THmuz5eBrIrfurRZc6X6KaIqGxRz4FRpRZIolEgdtU4gGvGk0BJi QbRGqS//WYtsGL/1mPsmWyNFhIgiHwWqaj/BA= Received: by 10.213.11.8 with SMTP id r8mr14608498ebr.54.1288727098239; Tue, 02 Nov 2010 12:44:58 -0700 (PDT) Received: from localhost.localdomain ([95.84.33.166]) by mx.google.com with ESMTPS id w20sm5752673eeh.6.2010.11.02.12.44.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 02 Nov 2010 12:44:57 -0700 (PDT) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 3/4] CIFS: New write logic Date: Tue, 2 Nov 2010 22:44:20 +0300 Message-Id: <1288727061-18759-3-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1288727061-18759-1-git-send-email-piastryyy@gmail.com> References: <1288727061-18759-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]); Tue, 02 Nov 2010 19:45:00 +0000 (UTC) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index bb7f36e..ccbbea0 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -596,12 +596,43 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov, static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos) { - struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; - ssize_t written; + struct inode *inode; + struct cifs_sb_info *cifs_sb; + ssize_t written, cache_written; + loff_t saved_pos; + + inode = iocb->ki_filp->f_path.dentry->d_inode; + + if (CIFS_I(inode)->clientCanCacheAll) + return generic_file_aio_write(iocb, iov, nr_segs, pos); + + cifs_sb = CIFS_SB(iocb->ki_filp->f_path.dentry->d_sb); + + if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) == 0) { + int rc; + + written = generic_file_aio_write(iocb, iov, nr_segs, pos); + + rc = filemap_fdatawrite(inode->i_mapping); + if (rc) + cFYI(1, "cifs_file_aio_write: %d rc on %p inode", + rc, inode); + return written; + } + + saved_pos = pos; + written = cifs_user_write(iocb->ki_filp, iov->iov_base, + iov->iov_len, &pos); + + if (written > 0) { + cache_written = generic_file_aio_write(iocb, iov, + nr_segs, saved_pos); + if (cache_written != written) + cERROR(1, "Cache written and server written data " + "lengths are different"); + } else + iocb->ki_pos = pos; - written = generic_file_aio_write(iocb, iov, nr_segs, pos); - if (!CIFS_I(inode)->clientCanCacheAll) - filemap_fdatawrite(inode->i_mapping); return written; } diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 81ec50e..9bde94a 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1541,7 +1541,11 @@ static int cifs_write_end(struct file *file, struct address_space *mapping, struct page *page, void *fsdata) { int rc; - struct inode *inode = mapping->host; + struct inode *inode; + struct cifs_sb_info *cifs_sb; + + inode = mapping->host; + cifs_sb = CIFS_SB(inode->i_sb); cFYI(1, "write_end for page %p from pos %lld with %d bytes", page, pos, copied); @@ -1574,7 +1578,13 @@ static int cifs_write_end(struct file *file, struct address_space *mapping, } else { rc = copied; pos += copied; - set_page_dirty(page); + /* if we have strict cache switched on and don't have Exclusive + oplock for the inode, we don't have to set_page_dirty + because we flushed the data to the server in + cifs_file_aio_write before */ + if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) == 0 || + CIFS_I(inode)->clientCanCacheAll) + set_page_dirty(page); } if (rc > 0) {