aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/quota.h1
-rw-r--r--include/linux/quotaops.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/quota.h b/include/linux/quota.h
index e3b07895d327..422e6aa78edc 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -297,7 +297,6 @@ struct quota_format_ops {
297struct dquot_operations { 297struct dquot_operations {
298 int (*initialize) (struct inode *, int); 298 int (*initialize) (struct inode *, int);
299 int (*drop) (struct inode *); 299 int (*drop) (struct inode *);
300 int (*transfer) (struct inode *, qid_t *, unsigned long);
301 int (*write_dquot) (struct dquot *); /* Ordinary dquot write */ 300 int (*write_dquot) (struct dquot *); /* Ordinary dquot write */
302 struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */ 301 struct dquot *(*alloc_dquot)(struct super_block *, int); /* Allocate memory for new dquot */
303 void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */ 302 void (*destroy_dquot)(struct dquot *); /* Free memory for dquot */
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 9ce7f051a4ba..fa27b7218c82 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -42,7 +42,6 @@ int dquot_alloc_inode(const struct inode *inode);
42int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); 42int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
43void dquot_free_inode(const struct inode *inode); 43void dquot_free_inode(const struct inode *inode);
44 44
45int dquot_transfer(struct inode *inode, qid_t *chid, unsigned long mask);
46int dquot_commit(struct dquot *dquot); 45int dquot_commit(struct dquot *dquot);
47int dquot_acquire(struct dquot *dquot); 46int dquot_acquire(struct dquot *dquot);
48int dquot_release(struct dquot *dquot); 47int dquot_release(struct dquot *dquot);
@@ -66,7 +65,7 @@ int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *d
66int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di); 65int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di);
67 66
68void vfs_dq_drop(struct inode *inode); 67void vfs_dq_drop(struct inode *inode);
69int vfs_dq_transfer(struct inode *inode, struct iattr *iattr); 68int dquot_transfer(struct inode *inode, struct iattr *iattr);
70int vfs_dq_quota_on_remount(struct super_block *sb); 69int vfs_dq_quota_on_remount(struct super_block *sb);
71 70
72static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type) 71static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type)
@@ -234,7 +233,7 @@ static inline int vfs_dq_quota_on_remount(struct super_block *sb)
234 return 0; 233 return 0;
235} 234}
236 235
237static inline int vfs_dq_transfer(struct inode *inode, struct iattr *iattr) 236static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
238{ 237{
239 return 0; 238 return 0;
240} 239}