From: Nick Piggin Subject: Re: Fwd: fsx-linux failing with latest cifs-2.6 git tree Date: Sat, 22 Nov 2008 00:44:44 +0100 Message-ID: <20081121234444.GA9857@wotan.suse.de> References: <20081121105613.09a8cb8e@tleilax.poochiereds.net> <524f69650811210820s549de2bah3181cbc0c5633091@mail.gmail.com> <20081121112249.0b408b55@tleilax.poochiereds.net> <524f69650811210846q7502fd99m6f4d335bb6ac1b65@mail.gmail.com> <524f69650811211109w659e5decoa34a8e0f907772a3@mail.gmail.com> <524f69650811211113q4fffcc70of88cb85db531c358@mail.gmail.com> <1227296476.20845.8.camel@norville.austin.ibm.com> <524f69650811211218v78295682lcf6dce842327b097@mail.gmail.com> <524f69650811211238x3c81d899r225f46776aeb52f1@mail.gmail.com> <1227300101.20845.11.camel@norville.austin.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Steve French , Jeff Layton , pbadari@us.ibm.com, linux-fsdevel , "linux-cifs-client@lists.samba.org" To: Dave Kleikamp Return-path: Received: from mx2.suse.de ([195.135.220.15]:41783 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbYKUXor (ORCPT ); Fri, 21 Nov 2008 18:44:47 -0500 Content-Disposition: inline In-Reply-To: <1227300101.20845.11.camel@norville.austin.ibm.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Fri, Nov 21, 2008 at 02:41:41PM -0600, Dave Kleikamp wrote: > On Fri, 2008-11-21 at 14:38 -0600, Steve French wrote: > > Fix attached. > > > > Shaggy/Jeff/Nick etc. do you want to review/ack it since it is late in the rc? > > Acked-by: Dave Kleikamp > > > > > On Fri, Nov 21, 2008 at 2:18 PM, Steve French wrote: > > > Looks like the following change to cifs_write_begin does fix it ... > > > thanks Shaggy ... > > > > > > @@ -2062,8 +2074,10 @@ static int cifs_write_begin(struct file *file, > > > struct address_space *mapping, > > > { > > > pgoff_t index = pos >> PAGE_CACHE_SHIFT; > > > loff_t offset = pos & (PAGE_CACHE_SIZE - 1); > > > + loff_t page_start = pos & PAGE_MASK; > > > > > > cFYI(1, ("write_begin from %lld len %d", (long long)pos, len)); > > > @@ -2081,13 +2095,14 @@ static int cifs_write_begin(struct file *file, > > > struct address_space *mapping, > > > int rc; > > > > > > /* might as well read a page, it is fast enough */ > > > - rc = cifs_readpage_worker(file, *pagep, &offset); > > > + rc = cifs_readpage_worker(file, *pagep, &page_start); > > > > > > /* we do not need to pass errors back > > > e.g. if we do not have read access to the file > > > because cifs_write_end will attempt synchronous writes > > > -- shaggy */ > > > > > > Thanks guys. Yeah that is how I thought cifs_readpage_worker should work when making that change, but obiously didn't have an eye for details. Thanks Shaggy!