Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 252709
b: refs/heads/master
c: 64370e2
h: refs/heads/master
i:
  252707: a237a39
v: v3
  • Loading branch information
Sage Weil authored and Al Viro committed May 28, 2011
1 parent f1f2e09 commit d01247a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44a8e6364e48ab93a1d86385b5fc9efe81395fa9
refs/heads/master: 64370e2f9df572977757d70b1ad293b743dd9e20
5 changes: 0 additions & 5 deletions trunk/fs/logfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,6 @@ static int logfs_rmdir(struct inode *dir, struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;

dentry_unhash(dentry);

if (!logfs_empty_dir(inode))
return -ENOTEMPTY;

Expand Down Expand Up @@ -624,9 +622,6 @@ static int logfs_rename_cross(struct inode *old_dir, struct dentry *old_dentry,
loff_t pos;
int err;

if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
dentry_unhash(new_dentry);

/* 1. locate source dd */
err = logfs_get_dd(old_dir, old_dentry, &dd, &pos);
if (err)
Expand Down

0 comments on commit d01247a

Please sign in to comment.