View | Details | Raw Unified | Return to bug 941305
Collapse All | Expand All

(-)linux-3.16-openSUSE-13.2/fs/xfs/xfs_dir2_node.c (-1 / +7 lines)
Lines 2144-2149 xfs_dir2_node_replace( Link Here
2144
	int			error;		/* error return value */
2144
	int			error;		/* error return value */
2145
	int			i;		/* btree level */
2145
	int			i;		/* btree level */
2146
	xfs_ino_t		inum;		/* new inode number */
2146
	xfs_ino_t		inum;		/* new inode number */
2147
	int			ftype;		/* new file type */
2147
	xfs_dir2_leaf_t		*leaf;		/* leaf structure */
2148
	xfs_dir2_leaf_t		*leaf;		/* leaf structure */
2148
	xfs_dir2_leaf_entry_t	*lep;		/* leaf entry being changed */
2149
	xfs_dir2_leaf_entry_t	*lep;		/* leaf entry being changed */
2149
	int			rval;		/* internal return value */
2150
	int			rval;		/* internal return value */
Lines 2157-2163 xfs_dir2_node_replace( Link Here
2157
	state = xfs_da_state_alloc();
2158
	state = xfs_da_state_alloc();
2158
	state->args = args;
2159
	state->args = args;
2159
	state->mp = args->dp->i_mount;
2160
	state->mp = args->dp->i_mount;
2161
	/*
2162
	 * We have to save new inode number and ftype since
2163
 	 * xfs_da3_node_lookup_int() is going to overwrite them
2164
	 */
2160
	inum = args->inumber;
2165
	inum = args->inumber;
2166
	ftype = args->filetype;
2161
	/*
2167
	/*
2162
	 * Lookup the entry to change in the btree.
2168
	 * Lookup the entry to change in the btree.
2163
	 */
2169
	 */
Lines 2195-2201 xfs_dir2_node_replace( Link Here
2195
		 * Fill in the new inode number and log the entry.
2201
		 * Fill in the new inode number and log the entry.
2196
		 */
2202
		 */
2197
		dep->inumber = cpu_to_be64(inum);
2203
		dep->inumber = cpu_to_be64(inum);
2198
		args->dp->d_ops->data_put_ftype(dep, args->filetype);
2204
		args->dp->d_ops->data_put_ftype(dep, ftype);
2199
		xfs_dir2_data_log_entry(args, state->extrablk.bp, dep);
2205
		xfs_dir2_data_log_entry(args, state->extrablk.bp, dep);
2200
		rval = 0;
2206
		rval = 0;
2201
	}
2207
	}

Return to bug 941305