ovl: clear nlink on rmdir

To make delete notification work on fa/inotify.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Orabug: 26401569

(backport upstream commit dbc816d05ddcfb189af8784d04fc84c812db3747)

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index da2c44908f07ac8323a67aebcc8b303e0f75064b..70f8093975c6f283d6e4e3b2a194486b94b83fad 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -702,8 +702,12 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir)
        else
                err = ovl_remove_and_whiteout(dentry, is_dir);
        revert_creds(old_cred);
-       if (!err && !is_dir)
-               drop_nlink(dentry->d_inode);
+       if (!err) {
+               if (is_dir)
+                       clear_nlink(dentry->d_inode);
+               else
+                       drop_nlink(dentry->d_inode);
+       }
 out_drop_write:
        ovl_drop_write(dentry);
 out: