From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210AbcG2BTu (ORCPT ); Thu, 28 Jul 2016 21:19:50 -0400 Received: from ozlabs.org ([103.22.144.67]:44017 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbcG2BTl (ORCPT ); Thu, 28 Jul 2016 21:19:41 -0400 Date: Fri, 29 Jul 2016 11:19:38 +1000 From: Stephen Rothwell To: Al Viro Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds Subject: linux-next: build failure after merge of the vfs tree Message-ID: <20160729111938.56ee0fa1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Al, After merging the vfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/fuse/dir.c: In function 'fuse_reverse_inval_entry': fs/fuse/dir.c:958:13: error: assignment of member 'hash' in read-only object name->hash = full_name_hash(dir, name->name, name->len); ^ Caused by commit 8387ff2577eb ("vfs: make the string hashes salt the hash") from Linus' tree interacting with commit 5e70178ae20b ("qstr: constify instances in fuse") from the vfs tree. I added this merge fix patch: From: Stephen Rothwell Date: Fri, 29 Jul 2016 11:07:45 +1000 Subject: [PATCH] qstr: unconstify fuse_reverse_inval_entry parameter Signed-off-by: Stephen Rothwell --- fs/fuse/dir.c | 2 +- fs/fuse/fuse_i.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index f910578e51ba..c47b7780ce37 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -935,7 +935,7 @@ int fuse_update_attributes(struct inode *inode, struct kstat *stat, } int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid, - u64 child_nodeid, const struct qstr *name) + u64 child_nodeid, struct qstr *name) { int err = -ENOTDIR; struct inode *parent; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 6df761726a53..d98d8cc84def 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -929,7 +929,7 @@ int fuse_reverse_inval_inode(struct super_block *sb, u64 nodeid, * then the dentry is unhashed (d_delete()). */ int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid, - u64 child_nodeid, const struct qstr *name); + u64 child_nodeid, struct qstr *name); int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file, bool isdir); -- 2.8.1 -- Cheers, Stephen Rothwell