Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / include / linux / quotaops.h

diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 185d948297011fe6bd540e4847da2ff5ffa63761..9cf0cd3dc88c6864ff8fa5fc498ea2f9feac83c5 100644 (file)
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -54,6 +54,16 @@ static inline struct dquot *dqgrab(struct dquot *dquot)
        atomic_inc(&dquot->dq_count);
        return dquot;
 }
+
+static inline bool dquot_is_busy(struct dquot *dquot)
+{
+       if (test_bit(DQ_MOD_B, &dquot->dq_flags))
+               return true;
+       if (atomic_read(&dquot->dq_count) > 1)
+               return true;
+       return false;
+}
+
 void dqput(struct dquot *dquot);
 int dquot_scan_active(struct super_block *sb,
                      int (*fn)(struct dquot *dquot, unsigned long priv),
@@ -87,7 +97,9 @@ int dquot_mark_dquot_dirty(struct dquot *dquot);
 
 int dquot_file_open(struct inode *inode, struct file *file);
 
-int dquot_enable(struct inode *inode, int type, int format_id,
+int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,
+       unsigned int flags);
+int dquot_load_quota_inode(struct inode *inode, int type, int format_id,
        unsigned int flags);
 int dquot_quota_on(struct super_block *sb, int type, int format_id,
        const struct path *path);