diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 09:05:05 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:30 -0500 |
commit | 9f7547580263d4a55efe06ce5cfd567f568be6e8 (patch) | |
tree | 6f926a075eeed815d0a6680c06f235da0e5ea6d9 /fs/udf | |
parent | 257ba15cedf1288f0c96118d7e63947231d27278 (diff) |
dquot: cleanup dquot drop routine
Get rid of the drop dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.
Rename the now static low-level dquot_drop helper to __dquot_drop
and vfs_dq_drop to dquot_drop to have a consistent namespace.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
-rw-r--r-- | fs/udf/ialloc.c | 4 | ||||
-rw-r--r-- | fs/udf/inode.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index e1856b89c9c8..15c6e992e587 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c | |||
@@ -37,7 +37,7 @@ void udf_free_inode(struct inode *inode) | |||
37 | * as writing the quota to disk may need the lock as well. | 37 | * as writing the quota to disk may need the lock as well. |
38 | */ | 38 | */ |
39 | dquot_free_inode(inode); | 39 | dquot_free_inode(inode); |
40 | vfs_dq_drop(inode); | 40 | dquot_drop(inode); |
41 | 41 | ||
42 | clear_inode(inode); | 42 | clear_inode(inode); |
43 | 43 | ||
@@ -156,7 +156,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err) | |||
156 | vfs_dq_init(inode); | 156 | vfs_dq_init(inode); |
157 | ret = dquot_alloc_inode(inode); | 157 | ret = dquot_alloc_inode(inode); |
158 | if (ret) { | 158 | if (ret) { |
159 | vfs_dq_drop(inode); | 159 | dquot_drop(inode); |
160 | inode->i_flags |= S_NOQUOTA; | 160 | inode->i_flags |= S_NOQUOTA; |
161 | inode->i_nlink = 0; | 161 | inode->i_nlink = 0; |
162 | iput(inode); | 162 | iput(inode); |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 859389a3832b..1199e8e21ee2 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -109,7 +109,7 @@ void udf_clear_inode(struct inode *inode) | |||
109 | (unsigned long long)iinfo->i_lenExtents); | 109 | (unsigned long long)iinfo->i_lenExtents); |
110 | } | 110 | } |
111 | 111 | ||
112 | vfs_dq_drop(inode); | 112 | dquot_drop(inode); |
113 | kfree(iinfo->i_ext.i_data); | 113 | kfree(iinfo->i_ext.i_data); |
114 | iinfo->i_ext.i_data = NULL; | 114 | iinfo->i_ext.i_data = NULL; |
115 | } | 115 | } |