Attachment 644636 Details for Bug 941305

[patch] xfs: Fix file type directory corruption for btree directories

xfs-13.2-dir_fix.diff (text/plain), 2.18 KB, created by Jan Kara on 2015-08-21 17:54:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kara

Created: 2015-08-21 17:54:45 UTC

Size: 2.18 KB

patch

obsolete

>From: Jan Kara <jack@suse.com>
>Subject: xfs: Fix file type directory corruption for btree directories
>References: bsc#941305
>Patch-mainline: Submitted
>
>Users have occasionally reported that file type for some directory
>entries is wrong. This mostly happened after updating libraries some
>libraries. After some debugging the problem was traced down to
>xfs_dir2_node_replace(). The function uses args->filetype as a file type
>to store in the replaced directory entry however it also calls
>xfs_da3_node_lookup_int() which will store file type of the current
>directory entry in args->filetype. Thus we fail to change file type of a
>directory entry to a proper type.
>
>Fix the problem by storing new file type in a local variable before
>calling xfs_da3_node_lookup_int().
>
>Reported-by: Giacomo Comes <comes@naic.edu>
>Signed-off-by: Jan Kara <jack@suse.com>
>
>diff -rupX /crypted/home/jack/.kerndiffexclude linux-3.16-openSUSE-13.2/fs/xfs/xfs_dir2_node.c linux-3.16-openSUSE-13.2-1-xfs_dir_fix/fs/xfs/xfs_dir2_node.c
>--- linux-3.16-openSUSE-13.2/fs/xfs/xfs_dir2_node.c	2014-08-04 00:25:02.000000000 +0200
>+++ linux-3.16-openSUSE-13.2-1-xfs_dir_fix/fs/xfs/xfs_dir2_node.c	2015-08-21 19:25:41.436118025 +0200
>@@ -2144,6 +2144,7 @@ xfs_dir2_node_replace(
> 	int			error;		/* error return value */
> 	int			i;		/* btree level */
> 	xfs_ino_t		inum;		/* new inode number */
>+	int			ftype;		/* new file type */
> 	xfs_dir2_leaf_t		*leaf;		/* leaf structure */
> 	xfs_dir2_leaf_entry_t	*lep;		/* leaf entry being changed */
> 	int			rval;		/* internal return value */
>@@ -2157,7 +2158,12 @@ xfs_dir2_node_replace(
> 	state = xfs_da_state_alloc();
> 	state->args = args;
> 	state->mp = args->dp->i_mount;
>+	/*
>+	 * We have to save new inode number and ftype since
>+ 	 * xfs_da3_node_lookup_int() is going to overwrite them
>+	 */
> 	inum = args->inumber;
>+	ftype = args->filetype;
> 	/*
> 	 * Lookup the entry to change in the btree.
> 	 */
>@@ -2195,7 +2201,7 @@ xfs_dir2_node_replace(
> 		 * Fill in the new inode number and log the entry.
> 		 */
> 		dep->inumber = cpu_to_be64(inum);
>-		args->dp->d_ops->data_put_ftype(dep, args->filetype);
>+		args->dp->d_ops->data_put_ftype(dep, ftype);
> 		xfs_dir2_data_log_entry(args, state->extrablk.bp, dep);
> 		rval = 0;
> 	}

Actions: View | Diff

Attachments on bug 941305: 643793 | 643916 | 643953 | 644505 | 644506 | 644524 | 644557 | 644605 | 644636