diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
| commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
| tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /fs/ubifs/dir.c | |
| parent | 1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'fs/ubifs/dir.c')
| -rw-r--r-- | fs/ubifs/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 5c96f1fb7016..2b267c9a1806 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
| @@ -587,7 +587,6 @@ static int ubifs_unlink(struct inode *dir, struct dentry *dentry) | |||
| 587 | if (err) { | 587 | if (err) { |
| 588 | if (err != -ENOSPC) | 588 | if (err != -ENOSPC) |
| 589 | return err; | 589 | return err; |
| 590 | err = 0; | ||
| 591 | budgeted = 0; | 590 | budgeted = 0; |
| 592 | } | 591 | } |
| 593 | 592 | ||