Remove BKL from affs_rmdir() as per Roman Zippel

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index 39657f33839dedbb44c53b60be0df78008cae7fa..91ab22833e9f6fa4b198a2de357586e57124083b 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -338,21 +338,10 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 int
 affs_rmdir(struct inode *dir, struct dentry *dentry)
 {
-       int res;
        pr_debug("AFFS: rmdir(dir=%u, \"%.*s\")\n", (u32)dir->i_ino,
                 (int)dentry->d_name.len, dentry->d_name.name);
 
-       lock_kernel();
-
-       /* WTF??? */
-       if (!dentry->d_inode) {
-               unlock_kernel();
-               return -ENOENT;
-       }
-
-       res = affs_remove_header(dentry);
-       unlock_kernel();
-       return res;
+       return affs_remove_header(dentry);
 }
 
 int