diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /fs/ext2/ialloc.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index ee9ed31948e1..c4e81dfb74ba 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -601,7 +601,7 @@ fail_free_drop: | |||
| 601 | fail_drop: | 601 | fail_drop: |
| 602 | dquot_drop(inode); | 602 | dquot_drop(inode); |
| 603 | inode->i_flags |= S_NOQUOTA; | 603 | inode->i_flags |= S_NOQUOTA; |
| 604 | inode->i_nlink = 0; | 604 | clear_nlink(inode); |
| 605 | unlock_new_inode(inode); | 605 | unlock_new_inode(inode); |
| 606 | iput(inode); | 606 | iput(inode); |
| 607 | return ERR_PTR(err); | 607 | return ERR_PTR(err); |