From patchwork Mon Nov 8 17:48:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 308862 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 oA8HmLWx006837 for ; Mon, 8 Nov 2010 17:48:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752883Ab0KHRsU (ORCPT ); Mon, 8 Nov 2010 12:48:20 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:64841 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752818Ab0KHRsU (ORCPT ); Mon, 8 Nov 2010 12:48:20 -0500 Received: by eye27 with SMTP id 27so2942113eye.19 for ; Mon, 08 Nov 2010 09:48:19 -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=qc494HaNqYIvrcceYL6LojEHSGjx2Cc0am9cEY4BcY0=; b=LeHMWPWD8iiPi/C67g9vrzF5FA81yV8+DVuxhYuDM3rt6YU7ngo7bBLLoUYCCmBxv2 5X++Li29FUL+vyQ9lEQa5pdyZnrKcpD5zyx/9ncDgGOxqMrnbuyjekNud9ZMrynH8gOj GDwwSVYBMHWpd3JZHjTsBz2Pn26bLF3OGmhkk= 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=ZyGmHXZWXGdi2w+GsUawveNLB4A986GChiAbzdsHMbb/LoB6wss6USghc6+tE0cmq8 E5zka5slXmWqa/+7xv31dCoJ+Ha3UTrGSM8b/01DFD5Uwmz8iQyd4VLdW/n93Jh8+H1I IM+lTzWzhq6yPC5CPfQctkFZ5m9DCRLdPpXvU= Received: by 10.14.119.3 with SMTP id m3mr3597109eeh.24.1289238499002; Mon, 08 Nov 2010 09:48:19 -0800 (PST) Received: from localhost.localdomain ([95.84.57.9]) by mx.google.com with ESMTPS id q58sm127253eeh.21.2010.11.08.09.48.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Nov 2010 09:48:17 -0800 (PST) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 3/6] CIFS: Make write call work with strict cache mode Date: Mon, 8 Nov 2010 20:48:00 +0300 Message-Id: <1289238480-11801-1-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1288945777-9197-4-git-send-email-piastryyy@gmail.com> References: <1288945777-9197-4-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, 08 Nov 2010 17:48:22 +0000 (UTC) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index bb7f36e..fbcd219 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -596,12 +596,53 @@ 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 && CIFS_I(inode)->clientCanCacheRead) { + /* we have a data written to the server and at least oplock + for reading - store the data in the cache */ + 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"); + return written; + } + + if (written > 0) + invalidate_mapping_pages(inode->i_mapping, + saved_pos >> PAGE_CACHE_SHIFT, + (saved_pos+iov->iov_len-1) + >> PAGE_CACHE_SHIFT); + + 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 b36de2e..85824c0 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1537,7 +1537,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); @@ -1570,7 +1574,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) {