diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/ufs/ialloc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/ufs/ialloc.c')
| -rw-r--r-- | fs/ufs/ialloc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 3527c00fef0d..230ecf608026 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c | |||
| @@ -95,8 +95,8 @@ void ufs_free_inode (struct inode * inode) | |||
| 95 | 95 | ||
| 96 | is_directory = S_ISDIR(inode->i_mode); | 96 | is_directory = S_ISDIR(inode->i_mode); |
| 97 | 97 | ||
| 98 | vfs_dq_free_inode(inode); | 98 | dquot_free_inode(inode); |
| 99 | vfs_dq_drop(inode); | 99 | dquot_drop(inode); |
| 100 | 100 | ||
| 101 | clear_inode (inode); | 101 | clear_inode (inode); |
| 102 | 102 | ||
| @@ -355,9 +355,10 @@ cg_found: | |||
| 355 | 355 | ||
| 356 | unlock_super (sb); | 356 | unlock_super (sb); |
| 357 | 357 | ||
| 358 | if (vfs_dq_alloc_inode(inode)) { | 358 | dquot_initialize(inode); |
| 359 | vfs_dq_drop(inode); | 359 | err = dquot_alloc_inode(inode); |
| 360 | err = -EDQUOT; | 360 | if (err) { |
| 361 | dquot_drop(inode); | ||
| 361 | goto fail_without_unlock; | 362 | goto fail_without_unlock; |
| 362 | } | 363 | } |
| 363 | 364 | ||