From patchwork Fri Sep 24 12:59:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 204502 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 o8OD0FsU032336 for ; Fri, 24 Sep 2010 13:00:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752767Ab0IXNAP (ORCPT ); Fri, 24 Sep 2010 09:00:15 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:63332 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719Ab0IXNAO (ORCPT ); Fri, 24 Sep 2010 09:00:14 -0400 X-Authority-Analysis: v=1.1 cv=88hQlV/VnhrPhhPadeRuWHBNMc0qRjlK2a7+9yZesI4= c=1 sm=0 a=mBRGdjUhoKwA:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=20KFwNOVAAAA:8 a=QJQY5iQOwn5Wl4bNS_EA:9 a=Cv2EFPxoKQRRGR4w7cO0LNUgCYsA:4 a=jEp0ucaQiEUA:10 a=ld/erqUjW76FpBUqCqkKeA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:41971] helo=mail.poochiereds.net) by cdptpa-oedge01.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 35/F8-29299-1A0AC9C4; Fri, 24 Sep 2010 12:59:13 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 361C658174; Fri, 24 Sep 2010 08:59:13 -0400 (EDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH] cifs: cifs_flush should wait for writeback to complete before proceeding Date: Fri, 24 Sep 2010 08:59:13 -0400 Message-Id: <1285333153-9113-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.2.3 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]); Fri, 24 Sep 2010 13:00:15 +0000 (UTC) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 80856f1..8084a8d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -1737,16 +1737,13 @@ int cifs_flush(struct file *file, fl_owner_t id) struct inode *inode = file->f_path.dentry->d_inode; int rc = 0; - /* Rather than do the steps manually: - lock the inode for writing - loop through pages looking for write behind data (dirty pages) - coalesce into contiguous 16K (or smaller) chunks to write to server - send to server (prefer in parallel) - deal with writebehind errors - unlock inode for writing - filemapfdatawrite appears easier for the time being */ - - rc = filemap_fdatawrite(inode->i_mapping); + /* + * if the file is writable, then flush any dirty data to ensure that + * the filehandle isn't closed out before writeback completes. + */ + if (file->f_mode & FMODE_WRITE) + rc = filemap_write_and_wait(inode->i_mapping); + /* reset wb rc if we were able to write out dirty pages */ if (!rc) { rc = CIFS_I(inode)->write_behind_rc;