summary refs log tree commit diff
path: root/block/genhd.c
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2016-10-26 12:34:06 +0300
committerMiklos Szeredi <mszeredi@redhat.com>2016-12-16 11:02:57 +0100
commitd15951198eaccb92c6b49e62cb72f5ff62da2236 (patch)
tree9a93dbee0a4b62d70761993e5f9e949444868bed /block/genhd.c
parenta6c6065511411c57167a6cdae0c33263fb662b51 (diff)
downloadlinux-d15951198eaccb92c6b49e62cb72f5ff62da2236.tar.gz
ovl: check for emptiness of redirect dir
Before introducing redirect_dir feature, the condition
!ovl_lower_positive(dentry) for a directory, implied that it is a pure
upper directory, which may be removed if empty.

Now that directory can be redirect, it is possible that upper does not
cover any lower (i.e. !ovl_lower_positive(dentry)), but the directory is a
merge (with redirected path) and maybe non empty.

Check for this case in ovl_remove_upper().

This change fixes the following test case from rename-pop-dir.py
of unionmount-testsuite:

    """Remove dir and rename old name"""
    d = ctx.non_empty_dir()
    d2 = ctx.no_dir()

    ctx.rmdir(d, err=ENOTEMPTY)
    ctx.rename(d, d2)
    ctx.rmdir(d, err=ENOENT)
    ctx.rmdir(d2, err=ENOTEMPTY)

./run --ov rename-pop-dir
/mnt/a/no_dir103: Expected error (Directory not empty) was not produced

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions