diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 15:05:01 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-03-05 00:20:28 +0100 |
| commit | 63936ddaa16b9486e2d426ed7b09f559a5c60f87 (patch) | |
| tree | 4cb1c4581799e10c26dd71d1a7d420de3c2cfd05 /fs/ufs/ialloc.c | |
| parent | dquot: cleanup space allocation / freeing routines (diff) | |
| download | linux-63936ddaa16b9486e2d426ed7b09f559a5c60f87.tar.xz linux-63936ddaa16b9486e2d426ed7b09f559a5c60f87.zip | |
dquot: cleanup inode allocation / freeing routines
Get rid of the alloc_inode and free_inode dquot operations - they are
always called from the filesystem and if a filesystem really needs
their own (which none currently does) it can just call into it's
own routine directly.
Also get rid of the vfs_dq_alloc/vfs_dq_free wrappers and always
call the lowlevel dquot_alloc_inode / dqout_free_inode routines
directly, which now lose the number argument which is always 1.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ufs/ialloc.c')
| -rw-r--r-- | fs/ufs/ialloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 3527c00fef0d..02f77882c573 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -95,7 +95,7 @@ void ufs_free_inode (struct inode * inode) is_directory = S_ISDIR(inode->i_mode); - vfs_dq_free_inode(inode); + dquot_free_inode(inode); vfs_dq_drop(inode); clear_inode (inode); @@ -355,9 +355,10 @@ cg_found: unlock_super (sb); - if (vfs_dq_alloc_inode(inode)) { + vfs_dq_init(inode); + err = dquot_alloc_inode(inode); + if (err) { vfs_dq_drop(inode); - err = -EDQUOT; goto fail_without_unlock; } |