summaryrefslogtreecommitdiffstats
path: root/fs/debugfs
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-07-11 14:53:28 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-18 15:49:48 -0700
commita6bb340da32f0abf76656be1619fb85150eef61b (patch)
treefe013c74f0878456b8b622ac394eb1928c2ef0f8 /fs/debugfs
parent5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)
downloadlinux-a6bb340da32f0abf76656be1619fb85150eef61b.tar.gz
linux-a6bb340da32f0abf76656be1619fb85150eef61b.tar.bz2
linux-a6bb340da32f0abf76656be1619fb85150eef61b.zip
debugfs: remove rmdir() non-empty complaint
Hi, This patch kills the pointless debugfs rmdir() printk() when called on a non-empty directory. blktrace will sometimes have to call it a few times when forcefully ending a trace, which polutes the log with pointless warnings. Rationale: - It's more code to work-around this "problem" in the debugfs users, and you would have to add code to check for empty directories to do so (or assume that debugfs is using simple_ helpers, but that would be a layering violation). - Other rmdir() implementations don't complain about something this silly. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/debugfs')
-rw-r--r--fs/debugfs/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 1d533a2ec3a6..11be8a325e26 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -345,11 +345,6 @@ void debugfs_remove(struct dentry *dentry)
switch (dentry->d_inode->i_mode & S_IFMT) {
case S_IFDIR:
ret = simple_rmdir(parent->d_inode, dentry);
- if (ret)
- printk(KERN_ERR
- "DebugFS rmdir on %s failed : "
- "directory not empty.\n",
- dentry->d_name.name);
break;
case S_IFLNK:
kfree(dentry->d_inode->i_private);