diff options
Diffstat (limited to 'include/linux/quotaops.h')
| -rw-r--r-- | include/linux/quotaops.h | 281 |
1 files changed, 164 insertions, 117 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index f86702053853..742187f7a05c 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
| @@ -11,42 +11,85 @@ | |||
| 11 | #define _LINUX_QUOTAOPS_ | 11 | #define _LINUX_QUOTAOPS_ |
| 12 | 12 | ||
| 13 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
| 14 | |||
| 15 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
| 16 | 15 | ||
| 16 | static inline struct quota_info *sb_dqopt(struct super_block *sb) | ||
| 17 | { | ||
| 18 | return &sb->s_dquot; | ||
| 19 | } | ||
| 20 | |||
| 17 | #if defined(CONFIG_QUOTA) | 21 | #if defined(CONFIG_QUOTA) |
| 18 | 22 | ||
| 19 | /* | 23 | /* |
| 20 | * declaration of quota_function calls in kernel. | 24 | * declaration of quota_function calls in kernel. |
| 21 | */ | 25 | */ |
| 22 | extern void sync_dquots(struct super_block *sb, int type); | 26 | void sync_dquots(struct super_block *sb, int type); |
| 23 | 27 | ||
| 24 | extern int dquot_initialize(struct inode *inode, int type); | 28 | int dquot_initialize(struct inode *inode, int type); |
| 25 | extern int dquot_drop(struct inode *inode); | 29 | int dquot_drop(struct inode *inode); |
| 26 | 30 | ||
| 27 | extern int dquot_alloc_space(struct inode *inode, qsize_t number, int prealloc); | 31 | int dquot_alloc_space(struct inode *inode, qsize_t number, int prealloc); |
| 28 | extern int dquot_alloc_inode(const struct inode *inode, unsigned long number); | 32 | int dquot_alloc_inode(const struct inode *inode, unsigned long number); |
| 29 | 33 | ||
| 30 | extern int dquot_free_space(struct inode *inode, qsize_t number); | 34 | int dquot_free_space(struct inode *inode, qsize_t number); |
| 31 | extern int dquot_free_inode(const struct inode *inode, unsigned long number); | 35 | int dquot_free_inode(const struct inode *inode, unsigned long number); |
| 32 | 36 | ||
| 33 | extern int dquot_transfer(struct inode *inode, struct iattr *iattr); | 37 | int dquot_transfer(struct inode *inode, struct iattr *iattr); |
| 34 | extern int dquot_commit(struct dquot *dquot); | 38 | int dquot_commit(struct dquot *dquot); |
| 35 | extern int dquot_acquire(struct dquot *dquot); | 39 | int dquot_acquire(struct dquot *dquot); |
| 36 | extern int dquot_release(struct dquot *dquot); | 40 | int dquot_release(struct dquot *dquot); |
| 37 | extern int dquot_commit_info(struct super_block *sb, int type); | 41 | int dquot_commit_info(struct super_block *sb, int type); |
| 38 | extern int dquot_mark_dquot_dirty(struct dquot *dquot); | 42 | int dquot_mark_dquot_dirty(struct dquot *dquot); |
| 39 | 43 | ||
| 40 | extern int vfs_quota_on(struct super_block *sb, int type, int format_id, | 44 | int vfs_quota_on(struct super_block *sb, int type, int format_id, |
| 41 | char *path, int remount); | 45 | char *path, int remount); |
| 42 | extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name, | 46 | int vfs_quota_on_mount(struct super_block *sb, char *qf_name, |
| 43 | int format_id, int type); | 47 | int format_id, int type); |
| 44 | extern int vfs_quota_off(struct super_block *sb, int type, int remount); | 48 | int vfs_quota_off(struct super_block *sb, int type, int remount); |
| 45 | extern int vfs_quota_sync(struct super_block *sb, int type); | 49 | int vfs_quota_sync(struct super_block *sb, int type); |
| 46 | extern int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); | 50 | int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); |
| 47 | extern int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); | 51 | int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); |
| 48 | extern int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); | 52 | int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); |
| 49 | extern int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); | 53 | int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); |
| 54 | |||
| 55 | void vfs_dq_drop(struct inode *inode); | ||
| 56 | int vfs_dq_transfer(struct inode *inode, struct iattr *iattr); | ||
| 57 | int vfs_dq_quota_on_remount(struct super_block *sb); | ||
| 58 | |||
| 59 | static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type) | ||
| 60 | { | ||
| 61 | return sb_dqopt(sb)->info + type; | ||
| 62 | } | ||
| 63 | |||
| 64 | /* | ||
| 65 | * Functions for checking status of quota | ||
| 66 | */ | ||
| 67 | |||
| 68 | static inline int sb_has_quota_enabled(struct super_block *sb, int type) | ||
| 69 | { | ||
| 70 | if (type == USRQUOTA) | ||
| 71 | return sb_dqopt(sb)->flags & DQUOT_USR_ENABLED; | ||
| 72 | return sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED; | ||
| 73 | } | ||
| 74 | |||
| 75 | static inline int sb_any_quota_enabled(struct super_block *sb) | ||
| 76 | { | ||
| 77 | return sb_has_quota_enabled(sb, USRQUOTA) || | ||
| 78 | sb_has_quota_enabled(sb, GRPQUOTA); | ||
| 79 | } | ||
| 80 | |||
| 81 | static inline int sb_has_quota_suspended(struct super_block *sb, int type) | ||
| 82 | { | ||
| 83 | if (type == USRQUOTA) | ||
| 84 | return sb_dqopt(sb)->flags & DQUOT_USR_SUSPENDED; | ||
| 85 | return sb_dqopt(sb)->flags & DQUOT_GRP_SUSPENDED; | ||
| 86 | } | ||
| 87 | |||
| 88 | static inline int sb_any_quota_suspended(struct super_block *sb) | ||
| 89 | { | ||
| 90 | return sb_has_quota_suspended(sb, USRQUOTA) || | ||
| 91 | sb_has_quota_suspended(sb, GRPQUOTA); | ||
| 92 | } | ||
| 50 | 93 | ||
| 51 | /* | 94 | /* |
| 52 | * Operations supported for diskquotas. | 95 | * Operations supported for diskquotas. |
| @@ -59,38 +102,16 @@ extern struct quotactl_ops vfs_quotactl_ops; | |||
| 59 | 102 | ||
| 60 | /* It is better to call this function outside of any transaction as it might | 103 | /* It is better to call this function outside of any transaction as it might |
| 61 | * need a lot of space in journal for dquot structure allocation. */ | 104 | * need a lot of space in journal for dquot structure allocation. */ |
| 62 | static inline void DQUOT_INIT(struct inode *inode) | 105 | static inline void vfs_dq_init(struct inode *inode) |
| 63 | { | 106 | { |
| 64 | BUG_ON(!inode->i_sb); | 107 | BUG_ON(!inode->i_sb); |
| 65 | if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode)) | 108 | if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode)) |
| 66 | inode->i_sb->dq_op->initialize(inode, -1); | 109 | inode->i_sb->dq_op->initialize(inode, -1); |
| 67 | } | 110 | } |
| 68 | 111 | ||
| 69 | /* The same as with DQUOT_INIT */ | ||
| 70 | static inline void DQUOT_DROP(struct inode *inode) | ||
| 71 | { | ||
| 72 | /* Here we can get arbitrary inode from clear_inode() so we have | ||
| 73 | * to be careful. OTOH we don't need locking as quota operations | ||
| 74 | * are allowed to change only at mount time */ | ||
| 75 | if (!IS_NOQUOTA(inode) && inode->i_sb && inode->i_sb->dq_op | ||
| 76 | && inode->i_sb->dq_op->drop) { | ||
| 77 | int cnt; | ||
| 78 | /* Test before calling to rule out calls from proc and such | ||
| 79 | * where we are not allowed to block. Note that this is | ||
| 80 | * actually reliable test even without the lock - the caller | ||
| 81 | * must assure that nobody can come after the DQUOT_DROP and | ||
| 82 | * add quota pointers back anyway */ | ||
| 83 | for (cnt = 0; cnt < MAXQUOTAS; cnt++) | ||
| 84 | if (inode->i_dquot[cnt] != NODQUOT) | ||
| 85 | break; | ||
| 86 | if (cnt < MAXQUOTAS) | ||
| 87 | inode->i_sb->dq_op->drop(inode); | ||
| 88 | } | ||
| 89 | } | ||
| 90 | |||
| 91 | /* The following allocation/freeing/transfer functions *must* be called inside | 112 | /* The following allocation/freeing/transfer functions *must* be called inside |
| 92 | * a transaction (deadlocks possible otherwise) */ | 113 | * a transaction (deadlocks possible otherwise) */ |
| 93 | static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 114 | static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr) |
| 94 | { | 115 | { |
| 95 | if (sb_any_quota_enabled(inode->i_sb)) { | 116 | if (sb_any_quota_enabled(inode->i_sb)) { |
| 96 | /* Used space is updated in alloc_space() */ | 117 | /* Used space is updated in alloc_space() */ |
| @@ -102,15 +123,15 @@ static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | |||
| 102 | return 0; | 123 | return 0; |
| 103 | } | 124 | } |
| 104 | 125 | ||
| 105 | static inline int DQUOT_PREALLOC_SPACE(struct inode *inode, qsize_t nr) | 126 | static inline int vfs_dq_prealloc_space(struct inode *inode, qsize_t nr) |
| 106 | { | 127 | { |
| 107 | int ret; | 128 | int ret; |
| 108 | if (!(ret = DQUOT_PREALLOC_SPACE_NODIRTY(inode, nr))) | 129 | if (!(ret = vfs_dq_prealloc_space_nodirty(inode, nr))) |
| 109 | mark_inode_dirty(inode); | 130 | mark_inode_dirty(inode); |
| 110 | return ret; | 131 | return ret; |
| 111 | } | 132 | } |
| 112 | 133 | ||
| 113 | static inline int DQUOT_ALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 134 | static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr) |
| 114 | { | 135 | { |
| 115 | if (sb_any_quota_enabled(inode->i_sb)) { | 136 | if (sb_any_quota_enabled(inode->i_sb)) { |
| 116 | /* Used space is updated in alloc_space() */ | 137 | /* Used space is updated in alloc_space() */ |
| @@ -122,25 +143,25 @@ static inline int DQUOT_ALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | |||
| 122 | return 0; | 143 | return 0; |
| 123 | } | 144 | } |
| 124 | 145 | ||
| 125 | static inline int DQUOT_ALLOC_SPACE(struct inode *inode, qsize_t nr) | 146 | static inline int vfs_dq_alloc_space(struct inode *inode, qsize_t nr) |
| 126 | { | 147 | { |
| 127 | int ret; | 148 | int ret; |
| 128 | if (!(ret = DQUOT_ALLOC_SPACE_NODIRTY(inode, nr))) | 149 | if (!(ret = vfs_dq_alloc_space_nodirty(inode, nr))) |
| 129 | mark_inode_dirty(inode); | 150 | mark_inode_dirty(inode); |
| 130 | return ret; | 151 | return ret; |
| 131 | } | 152 | } |
| 132 | 153 | ||
| 133 | static inline int DQUOT_ALLOC_INODE(struct inode *inode) | 154 | static inline int vfs_dq_alloc_inode(struct inode *inode) |
| 134 | { | 155 | { |
| 135 | if (sb_any_quota_enabled(inode->i_sb)) { | 156 | if (sb_any_quota_enabled(inode->i_sb)) { |
| 136 | DQUOT_INIT(inode); | 157 | vfs_dq_init(inode); |
| 137 | if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA) | 158 | if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA) |
| 138 | return 1; | 159 | return 1; |
| 139 | } | 160 | } |
| 140 | return 0; | 161 | return 0; |
| 141 | } | 162 | } |
| 142 | 163 | ||
| 143 | static inline void DQUOT_FREE_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 164 | static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) |
| 144 | { | 165 | { |
| 145 | if (sb_any_quota_enabled(inode->i_sb)) | 166 | if (sb_any_quota_enabled(inode->i_sb)) |
| 146 | inode->i_sb->dq_op->free_space(inode, nr); | 167 | inode->i_sb->dq_op->free_space(inode, nr); |
| @@ -148,35 +169,25 @@ static inline void DQUOT_FREE_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | |||
| 148 | inode_sub_bytes(inode, nr); | 169 | inode_sub_bytes(inode, nr); |
| 149 | } | 170 | } |
| 150 | 171 | ||
| 151 | static inline void DQUOT_FREE_SPACE(struct inode *inode, qsize_t nr) | 172 | static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr) |
| 152 | { | 173 | { |
| 153 | DQUOT_FREE_SPACE_NODIRTY(inode, nr); | 174 | vfs_dq_free_space_nodirty(inode, nr); |
| 154 | mark_inode_dirty(inode); | 175 | mark_inode_dirty(inode); |
| 155 | } | 176 | } |
| 156 | 177 | ||
| 157 | static inline void DQUOT_FREE_INODE(struct inode *inode) | 178 | static inline void vfs_dq_free_inode(struct inode *inode) |
| 158 | { | 179 | { |
| 159 | if (sb_any_quota_enabled(inode->i_sb)) | 180 | if (sb_any_quota_enabled(inode->i_sb)) |
| 160 | inode->i_sb->dq_op->free_inode(inode, 1); | 181 | inode->i_sb->dq_op->free_inode(inode, 1); |
| 161 | } | 182 | } |
| 162 | 183 | ||
| 163 | static inline int DQUOT_TRANSFER(struct inode *inode, struct iattr *iattr) | ||
| 164 | { | ||
| 165 | if (sb_any_quota_enabled(inode->i_sb) && !IS_NOQUOTA(inode)) { | ||
| 166 | DQUOT_INIT(inode); | ||
| 167 | if (inode->i_sb->dq_op->transfer(inode, iattr) == NO_QUOTA) | ||
| 168 | return 1; | ||
| 169 | } | ||
| 170 | return 0; | ||
| 171 | } | ||
| 172 | |||
| 173 | /* The following two functions cannot be called inside a transaction */ | 184 | /* The following two functions cannot be called inside a transaction */ |
| 174 | static inline void DQUOT_SYNC(struct super_block *sb) | 185 | static inline void vfs_dq_sync(struct super_block *sb) |
| 175 | { | 186 | { |
| 176 | sync_dquots(sb, -1); | 187 | sync_dquots(sb, -1); |
| 177 | } | 188 | } |
| 178 | 189 | ||
| 179 | static inline int DQUOT_OFF(struct super_block *sb, int remount) | 190 | static inline int vfs_dq_off(struct super_block *sb, int remount) |
| 180 | { | 191 | { |
| 181 | int ret = -ENOSYS; | 192 | int ret = -ENOSYS; |
| 182 | 193 | ||
| @@ -185,22 +196,27 @@ static inline int DQUOT_OFF(struct super_block *sb, int remount) | |||
| 185 | return ret; | 196 | return ret; |
| 186 | } | 197 | } |
| 187 | 198 | ||
| 188 | static inline int DQUOT_ON_REMOUNT(struct super_block *sb) | 199 | #else |
| 200 | |||
| 201 | static inline int sb_has_quota_enabled(struct super_block *sb, int type) | ||
| 189 | { | 202 | { |
| 190 | int cnt; | 203 | return 0; |
| 191 | int ret = 0, err; | 204 | } |
| 192 | 205 | ||
| 193 | if (!sb->s_qcop || !sb->s_qcop->quota_on) | 206 | static inline int sb_any_quota_enabled(struct super_block *sb) |
| 194 | return -ENOSYS; | 207 | { |
| 195 | for (cnt = 0; cnt < MAXQUOTAS; cnt++) { | 208 | return 0; |
| 196 | err = sb->s_qcop->quota_on(sb, cnt, 0, NULL, 1); | ||
| 197 | if (err < 0 && !ret) | ||
| 198 | ret = err; | ||
| 199 | } | ||
| 200 | return ret; | ||
| 201 | } | 209 | } |
| 202 | 210 | ||
| 203 | #else | 211 | static inline int sb_has_quota_suspended(struct super_block *sb, int type) |
| 212 | { | ||
| 213 | return 0; | ||
| 214 | } | ||
| 215 | |||
| 216 | static inline int sb_any_quota_suspended(struct super_block *sb) | ||
| 217 | { | ||
| 218 | return 0; | ||
| 219 | } | ||
| 204 | 220 | ||
| 205 | /* | 221 | /* |
| 206 | * NO-OP when quota not configured. | 222 | * NO-OP when quota not configured. |
| @@ -208,113 +224,144 @@ static inline int DQUOT_ON_REMOUNT(struct super_block *sb) | |||
| 208 | #define sb_dquot_ops (NULL) | 224 | #define sb_dquot_ops (NULL) |
| 209 | #define sb_quotactl_ops (NULL) | 225 | #define sb_quotactl_ops (NULL) |
| 210 | 226 | ||
| 211 | static inline void DQUOT_INIT(struct inode *inode) | 227 | static inline void vfs_dq_init(struct inode *inode) |
| 212 | { | 228 | { |
| 213 | } | 229 | } |
| 214 | 230 | ||
| 215 | static inline void DQUOT_DROP(struct inode *inode) | 231 | static inline void vfs_dq_drop(struct inode *inode) |
| 216 | { | 232 | { |
| 217 | } | 233 | } |
| 218 | 234 | ||
| 219 | static inline int DQUOT_ALLOC_INODE(struct inode *inode) | 235 | static inline int vfs_dq_alloc_inode(struct inode *inode) |
| 220 | { | 236 | { |
| 221 | return 0; | 237 | return 0; |
| 222 | } | 238 | } |
| 223 | 239 | ||
| 224 | static inline void DQUOT_FREE_INODE(struct inode *inode) | 240 | static inline void vfs_dq_free_inode(struct inode *inode) |
| 225 | { | 241 | { |
| 226 | } | 242 | } |
| 227 | 243 | ||
| 228 | static inline void DQUOT_SYNC(struct super_block *sb) | 244 | static inline void vfs_dq_sync(struct super_block *sb) |
| 229 | { | 245 | { |
| 230 | } | 246 | } |
| 231 | 247 | ||
| 232 | static inline int DQUOT_OFF(struct super_block *sb, int remount) | 248 | static inline int vfs_dq_off(struct super_block *sb, int remount) |
| 233 | { | 249 | { |
| 234 | return 0; | 250 | return 0; |
| 235 | } | 251 | } |
| 236 | 252 | ||
| 237 | static inline int DQUOT_ON_REMOUNT(struct super_block *sb) | 253 | static inline int vfs_dq_quota_on_remount(struct super_block *sb) |
| 238 | { | 254 | { |
| 239 | return 0; | 255 | return 0; |
| 240 | } | 256 | } |
| 241 | 257 | ||
| 242 | static inline int DQUOT_TRANSFER(struct inode *inode, struct iattr *iattr) | 258 | static inline int vfs_dq_transfer(struct inode *inode, struct iattr *iattr) |
| 243 | { | 259 | { |
| 244 | return 0; | 260 | return 0; |
| 245 | } | 261 | } |
| 246 | 262 | ||
| 247 | static inline int DQUOT_PREALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 263 | static inline int vfs_dq_prealloc_space_nodirty(struct inode *inode, qsize_t nr) |
| 248 | { | 264 | { |
| 249 | inode_add_bytes(inode, nr); | 265 | inode_add_bytes(inode, nr); |
| 250 | return 0; | 266 | return 0; |
| 251 | } | 267 | } |
| 252 | 268 | ||
| 253 | static inline int DQUOT_PREALLOC_SPACE(struct inode *inode, qsize_t nr) | 269 | static inline int vfs_dq_prealloc_space(struct inode *inode, qsize_t nr) |
| 254 | { | 270 | { |
| 255 | DQUOT_PREALLOC_SPACE_NODIRTY(inode, nr); | 271 | vfs_dq_prealloc_space_nodirty(inode, nr); |
| 256 | mark_inode_dirty(inode); | 272 | mark_inode_dirty(inode); |
| 257 | return 0; | 273 | return 0; |
| 258 | } | 274 | } |
| 259 | 275 | ||
| 260 | static inline int DQUOT_ALLOC_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 276 | static inline int vfs_dq_alloc_space_nodirty(struct inode *inode, qsize_t nr) |
| 261 | { | 277 | { |
| 262 | inode_add_bytes(inode, nr); | 278 | inode_add_bytes(inode, nr); |
| 263 | return 0; | 279 | return 0; |
| 264 | } | 280 | } |
| 265 | 281 | ||
| 266 | static inline int DQUOT_ALLOC_SPACE(struct inode *inode, qsize_t nr) | 282 | static inline int vfs_dq_alloc_space(struct inode *inode, qsize_t nr) |
| 267 | { | 283 | { |
| 268 | DQUOT_ALLOC_SPACE_NODIRTY(inode, nr); | 284 | vfs_dq_alloc_space_nodirty(inode, nr); |
| 269 | mark_inode_dirty(inode); | 285 | mark_inode_dirty(inode); |
| 270 | return 0; | 286 | return 0; |
| 271 | } | 287 | } |
| 272 | 288 | ||
| 273 | static inline void DQUOT_FREE_SPACE_NODIRTY(struct inode *inode, qsize_t nr) | 289 | static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) |
| 274 | { | 290 | { |
| 275 | inode_sub_bytes(inode, nr); | 291 | inode_sub_bytes(inode, nr); |
| 276 | } | 292 | } |
| 277 | 293 | ||
| 278 | static inline void DQUOT_FREE_SPACE(struct inode *inode, qsize_t nr) | 294 | static inline void vfs_dq_free_space(struct inode *inode, qsize_t nr) |
| 279 | { | 295 | { |
| 280 | DQUOT_FREE_SPACE_NODIRTY(inode, nr); | 296 | vfs_dq_free_space_nodirty(inode, nr); |
| 281 | mark_inode_dirty(inode); | 297 | mark_inode_dirty(inode); |
| 282 | } | 298 | } |
| 283 | 299 | ||
| 284 | #endif /* CONFIG_QUOTA */ | 300 | #endif /* CONFIG_QUOTA */ |
| 285 | 301 | ||
| 286 | static inline int DQUOT_PREALLOC_BLOCK_NODIRTY(struct inode *inode, qsize_t nr) | 302 | static inline int vfs_dq_prealloc_block_nodirty(struct inode *inode, qsize_t nr) |
| 287 | { | 303 | { |
| 288 | return DQUOT_PREALLOC_SPACE_NODIRTY(inode, | 304 | return vfs_dq_prealloc_space_nodirty(inode, |
| 289 | nr << inode->i_sb->s_blocksize_bits); | 305 | nr << inode->i_sb->s_blocksize_bits); |
| 290 | } | 306 | } |
| 291 | 307 | ||
| 292 | static inline int DQUOT_PREALLOC_BLOCK(struct inode *inode, qsize_t nr) | 308 | static inline int vfs_dq_prealloc_block(struct inode *inode, qsize_t nr) |
| 293 | { | 309 | { |
| 294 | return DQUOT_PREALLOC_SPACE(inode, | 310 | return vfs_dq_prealloc_space(inode, |
| 295 | nr << inode->i_sb->s_blocksize_bits); | 311 | nr << inode->i_sb->s_blocksize_bits); |
| 296 | } | 312 | } |
| 297 | 313 | ||
| 298 | static inline int DQUOT_ALLOC_BLOCK_NODIRTY(struct inode *inode, qsize_t nr) | 314 | static inline int vfs_dq_alloc_block_nodirty(struct inode *inode, qsize_t nr) |
| 299 | { | 315 | { |
| 300 | return DQUOT_ALLOC_SPACE_NODIRTY(inode, | 316 | return vfs_dq_alloc_space_nodirty(inode, |
| 301 | nr << inode->i_sb->s_blocksize_bits); | 317 | nr << inode->i_sb->s_blocksize_bits); |
| 302 | } | 318 | } |
| 303 | 319 | ||
| 304 | static inline int DQUOT_ALLOC_BLOCK(struct inode *inode, qsize_t nr) | 320 | static inline int vfs_dq_alloc_block(struct inode *inode, qsize_t nr) |
| 305 | { | 321 | { |
| 306 | return DQUOT_ALLOC_SPACE(inode, | 322 | return vfs_dq_alloc_space(inode, |
| 307 | nr << inode->i_sb->s_blocksize_bits); | 323 | nr << inode->i_sb->s_blocksize_bits); |
| 308 | } | 324 | } |
| 309 | 325 | ||
| 310 | static inline void DQUOT_FREE_BLOCK_NODIRTY(struct inode *inode, qsize_t nr) | 326 | static inline void vfs_dq_free_block_nodirty(struct inode *inode, qsize_t nr) |
| 311 | { | 327 | { |
| 312 | DQUOT_FREE_SPACE_NODIRTY(inode, nr << inode->i_sb->s_blocksize_bits); | 328 | vfs_dq_free_space_nodirty(inode, nr << inode->i_sb->s_blocksize_bits); |
| 313 | } | 329 | } |
| 314 | 330 | ||
| 315 | static inline void DQUOT_FREE_BLOCK(struct inode *inode, qsize_t nr) | 331 | static inline void vfs_dq_free_block(struct inode *inode, qsize_t nr) |
| 316 | { | 332 | { |
| 317 | DQUOT_FREE_SPACE(inode, nr << inode->i_sb->s_blocksize_bits); | 333 | vfs_dq_free_space(inode, nr << inode->i_sb->s_blocksize_bits); |
| 318 | } | 334 | } |
| 319 | 335 | ||
| 336 | /* | ||
| 337 | * Define uppercase equivalents for compatibility with old function names | ||
| 338 | * Can go away when we think all users have been converted (15/04/2008) | ||
| 339 | */ | ||
| 340 | #define DQUOT_INIT(inode) vfs_dq_init(inode) | ||
| 341 | #define DQUOT_DROP(inode) vfs_dq_drop(inode) | ||
| 342 | #define DQUOT_PREALLOC_SPACE_NODIRTY(inode, nr) \ | ||
| 343 | vfs_dq_prealloc_space_nodirty(inode, nr) | ||
| 344 | #define DQUOT_PREALLOC_SPACE(inode, nr) vfs_dq_prealloc_space(inode, nr) | ||
| 345 | #define DQUOT_ALLOC_SPACE_NODIRTY(inode, nr) \ | ||
| 346 | vfs_dq_alloc_space_nodirty(inode, nr) | ||
| 347 | #define DQUOT_ALLOC_SPACE(inode, nr) vfs_dq_alloc_space(inode, nr) | ||
| 348 | #define DQUOT_PREALLOC_BLOCK_NODIRTY(inode, nr) \ | ||
| 349 | vfs_dq_prealloc_block_nodirty(inode, nr) | ||
| 350 | #define DQUOT_PREALLOC_BLOCK(inode, nr) vfs_dq_prealloc_block(inode, nr) | ||
| 351 | #define DQUOT_ALLOC_BLOCK_NODIRTY(inode, nr) \ | ||
| 352 | vfs_dq_alloc_block_nodirty(inode, nr) | ||
| 353 | #define DQUOT_ALLOC_BLOCK(inode, nr) vfs_dq_alloc_block(inode, nr) | ||
| 354 | #define DQUOT_ALLOC_INODE(inode) vfs_dq_alloc_inode(inode) | ||
| 355 | #define DQUOT_FREE_SPACE_NODIRTY(inode, nr) \ | ||
| 356 | vfs_dq_free_space_nodirty(inode, nr) | ||
| 357 | #define DQUOT_FREE_SPACE(inode, nr) vfs_dq_free_space(inode, nr) | ||
| 358 | #define DQUOT_FREE_BLOCK_NODIRTY(inode, nr) \ | ||
| 359 | vfs_dq_free_block_nodirty(inode, nr) | ||
| 360 | #define DQUOT_FREE_BLOCK(inode, nr) vfs_dq_free_block(inode, nr) | ||
| 361 | #define DQUOT_FREE_INODE(inode) vfs_dq_free_inode(inode) | ||
| 362 | #define DQUOT_TRANSFER(inode, iattr) vfs_dq_transfer(inode, iattr) | ||
| 363 | #define DQUOT_SYNC(sb) vfs_dq_sync(sb) | ||
| 364 | #define DQUOT_OFF(sb, remount) vfs_dq_off(sb, remount) | ||
| 365 | #define DQUOT_ON_REMOUNT(sb) vfs_dq_quota_on_remount(sb) | ||
| 366 | |||
| 320 | #endif /* _LINUX_QUOTAOPS_ */ | 367 | #endif /* _LINUX_QUOTAOPS_ */ |
