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

[Dave Chinner]

On Mon, Aug 24, 2015 at 11:26:37AM +0200, Jan Kara wrote:
> On Sat 22-08-15 09:11:54, Dave Chinner wrote:
> > On Fri, Aug 21, 2015 at 07:55:22PM +0200, Jan Kara wrote:
> > > 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 at naic.edu>
> > > Signed-off-by: Jan Kara <jack at suse.com>
> > 
> > So this is being triggered by a rename() operation on a large
> > directory? node format is the optimised form form for large dirs, so
> > I suspect that's why only few people see this. Can you see if you
> > can write a reproducer for it baseed on a large single directory and
> > renaming two files of different types (e.g. BLKDEV over REG) to see
> > if the cause is that simple?
> 
> Yes, I've tried and for a large enough directory renaming symlink over a
> regular file is all that is needed to corrupt the file type in the
> directory. Should I write a dedicated test for this or is there something
> that already excercises directory code? I know about fsstress runs but
> those would be hard to tweak to trigger this I guess.

I don't think there's anything specific that tests ftype after
rename. It might be worth writing a specific test for it that steps
through different directory formats and checks that ftype swaps with
rename corectly as we move through shortform, block, leaf and node
formats (i.e. as the directory gets larger).

Cheers,

Dave.
-- 
Dave Chinner
david at fromorbit.com