From: Oleg Drokin Date: Mon, 6 Jul 2015 16:48:40 +0000 (-0400) Subject: staging/lustre: make ldebugfs_remove recursive X-Git-Tag: firefly_0821_release~176^2~1221^2~733 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a491f2b80f2806221ba3a5a3e26fbe945f82d83;p=firefly-linux-kernel-4.4.55.git staging/lustre: make ldebugfs_remove recursive ldebugfs_remove is usually called on directories with files passed in as attributes, so simple debugfs_remove failes on them as not empty Switch to debugfs_remove_recursive. This fixes a number of problems where a new filesystem is mounted after being unmounted first. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c index c761dbf88278..08d1f0edf98d 100644 --- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c @@ -329,7 +329,7 @@ EXPORT_SYMBOL(ldebugfs_add_vars); void ldebugfs_remove(struct dentry **entryp) { - debugfs_remove(*entryp); + debugfs_remove_recursive(*entryp); *entryp = NULL; } EXPORT_SYMBOL(ldebugfs_remove);