Commit 145ecbd6 authored by Linus Torvalds's avatar Linus Torvalds

Remove BKL from affs_rmdir() as per Roman Zippel

parent 166d1bfb
...@@ -338,21 +338,10 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -338,21 +338,10 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
int int
affs_rmdir(struct inode *dir, struct dentry *dentry) affs_rmdir(struct inode *dir, struct dentry *dentry)
{ {
int res;
pr_debug("AFFS: rmdir(dir=%u, \"%.*s\")\n", (u32)dir->i_ino, pr_debug("AFFS: rmdir(dir=%u, \"%.*s\")\n", (u32)dir->i_ino,
(int)dentry->d_name.len, dentry->d_name.name); (int)dentry->d_name.len, dentry->d_name.name);
lock_kernel(); return affs_remove_header(dentry);
/* WTF??? */
if (!dentry->d_inode) {
unlock_kernel();
return -ENOENT;
}
res = affs_remove_header(dentry);
unlock_kernel();
return res;
} }
int int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment