Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178725
b: refs/heads/master
c: c674905
h: refs/heads/master
i:
  178723: 435e45a
v: v3
  • Loading branch information
Frederic Weisbecker committed Jan 2, 2010
1 parent b8d2f78 commit 828251c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 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: 3f14fea6bbd3444dd46a2af3a2e219e792616645
refs/heads/master: c674905ca74ad0ae5b048afb1ef68663a0d7e987
7 changes: 4 additions & 3 deletions trunk/fs/reiserfs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
struct reiserfs_transaction_handle th;
int jbegin_count;
unsigned long savelink;
int depth;

inode = dentry->d_inode;

Expand All @@ -932,7 +933,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
JOURNAL_PER_BALANCE_CNT * 2 + 2 +
4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);

reiserfs_write_lock(dir->i_sb);
depth = reiserfs_write_lock_once(dir->i_sb);
retval = journal_begin(&th, dir->i_sb, jbegin_count);
if (retval)
goto out_unlink;
Expand Down Expand Up @@ -993,7 +994,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)

retval = journal_end(&th, dir->i_sb, jbegin_count);
reiserfs_check_path(&path);
reiserfs_write_unlock(dir->i_sb);
reiserfs_write_unlock_once(dir->i_sb, depth);
return retval;

end_unlink:
Expand All @@ -1003,7 +1004,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
if (err)
retval = err;
out_unlink:
reiserfs_write_unlock(dir->i_sb);
reiserfs_write_unlock_once(dir->i_sb, depth);
return retval;
}

Expand Down

0 comments on commit 828251c

Please sign in to comment.