Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1949688AbdDYPWV (ORCPT ); Tue, 25 Apr 2017 11:22:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55024 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1949075AbdDYPMQ (ORCPT ); Tue, 25 Apr 2017 11:12:16 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Richard Weinberger Subject: [PATCH 4.10 16/24] ubifs: Fix RENAME_WHITEOUT support Date: Tue, 25 Apr 2017 16:09:25 +0100 Message-Id: <20170425150834.952501060@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170425150834.258486705@linuxfoundation.org> References: <20170425150834.258486705@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1140 Lines: 35 4.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau commit c3d9fda688742c06e89aa1f0f8fd943fc11468cb upstream. Remove faulty leftover check in do_rename(), apparently introduced in a merge that combined whiteout support changes with commit f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local filesystems") Fixes: f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local filesystems") Fixes: 9e0a1fff8db5 ("ubifs: Implement RENAME_WHITEOUT") Signed-off-by: Felix Fietkau Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- fs/ubifs/dir.c | 3 --- 1 file changed, 3 deletions(-) --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1316,9 +1316,6 @@ static int do_rename(struct inode *old_d unsigned int uninitialized_var(saved_nlink); struct fscrypt_name old_nm, new_nm; - if (flags & ~RENAME_NOREPLACE) - return -EINVAL; - /* * Budget request settings: deletion direntry, new direntry, removing * the old inode, and changing old and new parent directory inodes.