From e92f5669787430a41b6c6bf68d285e6f96389103 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Mon, 5 Sep 2011 23:31:15 -0400 Subject: [PATCH] Unionfs: debug - don't complain when d_deleted dentries Signed-off-by: Erez Zadok --- fs/unionfs/debug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c index 6092e69f97c..c07f6976fdb 100644 --- a/fs/unionfs/debug.c +++ b/fs/unionfs/debug.c @@ -362,12 +362,13 @@ void __unionfs_check_file(const struct file *file, pr_debug(" CF0: file/dentry=%p:%p fstart/end=%d:%d\n", file, dentry, fstart, fend); } - if (unlikely(fstart != dstart)) { + /* d_deleted dentries can be ignored for this test */ + if (unlikely(fstart != dstart) && !d_deleted(dentry)) { PRINT_CALLER(fname, fxn, line); pr_debug(" CF1: file/dentry=%p:%p fstart=%d dstart=%d\n", file, dentry, fstart, dstart); } - if (unlikely(fend != dend)) { + if (unlikely(fend != dend) && !d_deleted(dentry)) { PRINT_CALLER(fname, fxn, line); pr_debug(" CF2: file/dentry=%p:%p fend=%d dend=%d\n", file, dentry, fend, dend); -- 2.34.1