diff options
| author | James Morris <jmorris@namei.org> | 2009-03-28 04:57:13 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-28 04:57:13 +0100 |
| commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
| tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /fs/udf/ialloc.c | |
| parent | TOMOYO: Fix a typo. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-bb798169d1bb860b07192cf9c75937fadc8610b4.tar.xz linux-bb798169d1bb860b07192cf9c75937fadc8610b4.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'fs/udf/ialloc.c')
| -rw-r--r-- | fs/udf/ialloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index 31fc84297ddb..47dbe5613f90 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c @@ -36,8 +36,8 @@ void udf_free_inode(struct inode *inode) * Note: we must free any quota before locking the superblock, * as writing the quota to disk may need the lock as well. */ - DQUOT_FREE_INODE(inode); - DQUOT_DROP(inode); + vfs_dq_free_inode(inode); + vfs_dq_drop(inode); clear_inode(inode); @@ -154,8 +154,8 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) insert_inode_hash(inode); mark_inode_dirty(inode); - if (DQUOT_ALLOC_INODE(inode)) { - DQUOT_DROP(inode); + if (vfs_dq_alloc_inode(inode)) { + vfs_dq_drop(inode); inode->i_flags |= S_NOQUOTA; inode->i_nlink = 0; iput(inode); |