From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39179 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbbDZJjT (ORCPT ); Sun, 26 Apr 2015 05:39:19 -0400 Subject: Patch "jfs: fix readdir regression" has been added to the 3.10-stable tree To: dave.kleikamp@oracle.com, gregkh@linuxfoundation.org, jfs-discussion@lists.sourceforge.net, stable@vger.kernel.org Cc: , From: Date: Sun, 26 Apr 2015 11:39:16 +0200 In-Reply-To: <55108052.6070603@oracle.com> Message-ID: <143004115614065@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled jfs: fix readdir regression to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: jfs-fix-readdir-regression.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From dave.kleikamp@oracle.com Sun Apr 26 11:32:43 2015 From: Dave Kleikamp Date: Mon, 23 Mar 2015 16:06:26 -0500 Subject: jfs: fix readdir regression To: stable Cc: JFS Discussion Message-ID: <55108052.6070603@oracle.com> From: Dave Kleikamp Upstream commit 44512449, "jfs: fix readdir cookie incompatibility with NFSv4", was backported incorrectly into the stable trees which used the filldir callback (rather than dir_emit). The position is being incorrectly passed to filldir for the . and .. entries. The still-maintained stable trees that need to be fixed are 3.2.y, 3.4.y and 3.10.y. https://bugzilla.kernel.org/show_bug.cgi?id=94741 Signed-off-by: Dave Kleikamp Cc: jfs-discussion@lists.sourceforge.net Signed-off-by: Greg Kroah-Hartman --- fs/jfs/jfs_dtree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -3103,7 +3103,7 @@ int jfs_readdir(struct file *filp, void * self "." */ filp->f_pos = 1; - if (filldir(dirent, ".", 1, 0, ip->i_ino, + if (filldir(dirent, ".", 1, 1, ip->i_ino, DT_DIR)) return 0; } @@ -3111,7 +3111,7 @@ int jfs_readdir(struct file *filp, void * parent ".." */ filp->f_pos = 2; - if (filldir(dirent, "..", 2, 1, PARENT(ip), DT_DIR)) + if (filldir(dirent, "..", 2, 2, PARENT(ip), DT_DIR)) return 0; /* Patches currently in stable-queue which might be from dave.kleikamp@oracle.com are queue-3.10/jfs-fix-readdir-regression.patch