From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753322AbcCJTPY (ORCPT ); Thu, 10 Mar 2016 14:15:24 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:52976 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbcCJTPU (ORCPT ); Thu, 10 Mar 2016 14:15:20 -0500 Date: Thu, 10 Mar 2016 19:15:18 +0000 From: Al Viro To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [git pull] a couple of fixes Message-ID: <20160310191517.GK17997@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix for my dumb braino in ncpfs and a long-standing breakage on recovery from failed rename() in jffs2. The following changes since commit a528aca7f359f4b0b1d72ae406097e491a5ba9ea: use ->d_seq to get coherency between ->d_inode and ->d_flags (2016-02-29 12:16:43 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus for you to fetch changes up to f93812846f31381d35c04c6c577d724254355e7f: jffs2: reduce the breakage on recovery from halfway failed rename() (2016-03-07 23:07:10 -0500) ---------------------------------------------------------------- Al Viro (2): ncpfs: fix a braino in OOM handling in ncp_fill_cache() jffs2: reduce the breakage on recovery from halfway failed rename() fs/jffs2/dir.c | 11 ++++++++--- fs/ncpfs/dir.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-)