diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/ufs/ialloc.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/ufs/ialloc.c')
| -rw-r--r-- | fs/ufs/ialloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 6f5dcf006096..3527c00fef0d 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 | DQUOT_FREE_INODE(inode); | 98 | vfs_dq_free_inode(inode); |
| 99 | DQUOT_DROP(inode); | 99 | vfs_dq_drop(inode); |
| 100 | 100 | ||
| 101 | clear_inode (inode); | 101 | clear_inode (inode); |
| 102 | 102 | ||
| @@ -355,8 +355,8 @@ cg_found: | |||
| 355 | 355 | ||
| 356 | unlock_super (sb); | 356 | unlock_super (sb); |
| 357 | 357 | ||
| 358 | if (DQUOT_ALLOC_INODE(inode)) { | 358 | if (vfs_dq_alloc_inode(inode)) { |
| 359 | DQUOT_DROP(inode); | 359 | vfs_dq_drop(inode); |
| 360 | err = -EDQUOT; | 360 | err = -EDQUOT; |
| 361 | goto fail_without_unlock; | 361 | goto fail_without_unlock; |
| 362 | } | 362 | } |