Skip to contentSkip to conversation

Patch "jfs: fix readdir regression" has been added to the 3.10-stable tree

PATCH Applied [email protected] 2 participants 2 messages Apr 26, 2015 – May 3, 2015 1 message not in the archive

Subsystems (2)
Stable branch JFS filesystem
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

[email protected]

author maintainer Applied
#1 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From [email protected] Sun Apr 26 11:32:43 2015

From: Dave Kleikamp <[email protected]>
Date: Mon, 23 Mar 2015 16:06:26 -0500
Subject: jfs: fix readdir regression
To: stable <[email protected]>
Cc: JFS Discussion <[email protected]>
Message-ID: <[email protected]>

From: Dave Kleikamp <[email protected]>

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 <[email protected]>
Cc [email protected]
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 fs/jfs/jfs_dtree.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/jfs/jfs_dtree.c +2 -2
@@ -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 [email protected] are

queue-3.10/jfs-fix-readdir-regression.patch

Applied
#2 lore raw

Re: [PATCH][3.2.y][3.4.y][3.10.y] jfs: fix readdir regression

In reply to a message not in the archive
Quoted 7 lines · 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.

Queued up for 3.2, thanks.

Ben.

Quoted 31 lines

https://bugzilla.kernel.org/show_bug.cgi?id=94741

Signed-off-by Dave Kleikamp <[email protected]>
Cc [email protected]
Cc [email protected]
---
 fs/jfs/jfs_dtree.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/jfs/jfs_dtree.c +2 -2
index 9f7c758..f6f32fa 100644
@@ -3103,7 +3103,7 @@ int jfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 				 * 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 *dirent, filldir_t filldir)
 			 * 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;
 
 			/*
Signature · 2 lines
Ben Hutchings
One of the nice things about standards is that there are so many of them.