]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Fix directory hardlinks from deleted directories
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 1 Feb 2016 14:04:46 +0000 (14:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Mar 2016 23:34:53 +0000 (15:34 -0800)
commit3ef98fdea9a9bb8d0ba653faadcf16525d6e0f9c
tree6ef1fd1046b3eb6f3d59b6b43f855012762d47de
parent17d919c7379efbe5489243cd7ffa8a24fe09470b
Fix directory hardlinks from deleted directories

commit be629c62a603e5935f8177fd8a19e014100a259e upstream.

When a directory is deleted, we don't take too much care about killing off
all the dirents that belong to it — on the basis that on remount, the scan
will conclude that the directory is dead anyway.

This doesn't work though, when the deleted directory contained a child
directory which was moved *out*. In the early stages of the fs build
we can then end up with an apparent hard link, with the child directory
appearing both in its true location, and as a child of the original
directory which are this stage of the mount process we don't *yet* know
is defunct.

To resolve this, take out the early special-casing of the "directories
shall not have hard links" rule in jffs2_build_inode_pass1(), and let the
normal nlink processing happen for directories as well as other inodes.

Then later in the build process we can set ic->pino_nlink to the parent
inode#, as is required for directories during normal operaton, instead
of the nlink. And complain only *then* about hard links which are still
in evidence even after killing off all the unreachable paths.

Reported-by: Liu Song <liu.song11@zte.com.cn>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/jffs2/build.c
fs/jffs2/nodelist.h