From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756259AbcH2BeU convert rfc822-to-8bit (ORCPT ); Sun, 28 Aug 2016 21:34:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60710 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752154AbcH2BeS (ORCPT ); Sun, 28 Aug 2016 21:34:18 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: [PATCH 1/1] ceph: do not modify fi->frag in need_reset_readdir() From: "Yan, Zheng" In-Reply-To: <20160828164712.24840-1-nicolas.iooss_linux@m4x.org> Date: Mon, 29 Aug 2016 09:34:11 +0800 Cc: Sage Weil , Ilya Dryomov , Ceph Development , linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: References: <20160828164712.24840-1-nicolas.iooss_linux@m4x.org> To: Nicolas Iooss X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 29 Aug 2016 01:34:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Aug 29, 2016, at 00:47, Nicolas Iooss wrote: > > Commit f3c4ebe65ea1 ("ceph: using hash value to compose dentry offset") > modified "if (fpos_frag(new_pos) != fi->frag)" to "if (fi->frag |= > fpos_frag(new_pos))" in need_reset_readdir(), thus replacing a > comparison operator with an assignment one. > > This looks like a typo which is reported by clang when building the > kernel with some warning flags: > > fs/ceph/dir.c:600:22: error: using the result of an assignment as a > condition without parentheses [-Werror,-Wparentheses] > } else if (fi->frag |= fpos_frag(new_pos)) { > ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ > fs/ceph/dir.c:600:22: note: place parentheses around the assignment > to silence this warning > } else if (fi->frag |= fpos_frag(new_pos)) { > ^ > ( ) > fs/ceph/dir.c:600:22: note: use '!=' to turn this compound > assignment into an inequality comparison > } else if (fi->frag |= fpos_frag(new_pos)) { > ^~ > != > > Fixes: f3c4ebe65ea1 ("ceph: using hash value to compose dentry offset") > Cc: stable@vger.kernel.org # 4.7.x > Signed-off-by: Nicolas Iooss > --- > fs/ceph/dir.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c > index c64a0b794d49..df4b3e6fa563 100644 > --- a/fs/ceph/dir.c > +++ b/fs/ceph/dir.c > @@ -597,7 +597,7 @@ static bool need_reset_readdir(struct ceph_file_info *fi, loff_t new_pos) > if (is_hash_order(new_pos)) { > /* no need to reset last_name for a forward seek when > * dentries are sotred in hash order */ > - } else if (fi->frag |= fpos_frag(new_pos)) { > + } else if (fi->frag != fpos_frag(new_pos)) { > return true; > } > rinfo = fi->last_readdir ? &fi->last_readdir->r_reply_info : NULL; Applied, thanks Yan, Zheng > -- > 2.9.3 >