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

Ben Hutchings <[email protected]> Sun, 03 May 2015 22:34:53 +0100

Newsgroups	gmane.comp.file-systems.jfs.general
Message-ID	<1430688893.4113.113.camel__24116.6981788867$1430691426$gmane$org@decadent.org.uk>

On Mon, 2015-03-23 at 16:06 -0500, Dave Kleikamp wrote:
> 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.

> 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(-)
> 
> diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
> index 9f7c758..f6f32fa 100644
> --- a/fs/jfs/jfs_dtree.c
> +++ b/fs/jfs/jfs_dtree.c
> @@ -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;
>  
>  			/*

-- 
Ben Hutchings
One of the nice things about standards is that there are so many of them.

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y

_______________________________________________
Jfs-discussion mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jfs-discussion

signature.asc (application/pgp-signature, 811 B)