summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-04-28 02:14:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:33 -0700
commit03f6e92bdd467aed9d7571a571868563ae6ad288 (patch)
treeb10ba6373ffeb0d929ec9004faafcc0ac64103c0 /fs
parent8794b5b246cf6f67baf57bd9db386e79ca5cac33 (diff)
downloadop-kernel-dev-03f6e92bdd467aed9d7571a571868563ae6ad288.zip
op-kernel-dev-03f6e92bdd467aed9d7571a571868563ae6ad288.tar.gz
quota: various style cleanups
Cleanups in quota code: Change __inline__ to inline. Change some macros to inline functions. Remove vfs_quota_off_mount() macro. DQUOT_OFF() should be (0) is CONFIG_QUOTA is disabled. Move declaration of mark_dquot_dirty and dirty_dquot from quota.h to dquot.c [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/dquot.c10
-rw-r--r--fs/reiserfs/super.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index 24eef58..fc26d10 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -289,7 +289,15 @@ static void wait_on_dquot(struct dquot *dquot)
mutex_unlock(&dquot->dq_lock);
}
-#define mark_dquot_dirty(dquot) ((dquot)->dq_sb->dq_op->mark_dirty(dquot))
+static inline int dquot_dirty(struct dquot *dquot)
+{
+ return test_bit(DQ_MOD_B, &dquot->dq_flags);
+}
+
+static inline int mark_dquot_dirty(struct dquot *dquot)
+{
+ return dquot->dq_sb->dq_op->mark_dirty(dquot);
+}
int dquot_mark_dquot_dirty(struct dquot *dquot)
{
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 393cc22c..3e1972d 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -304,7 +304,7 @@ static int finish_unfinished(struct super_block *s)
/* Turn quotas off */
for (i = 0; i < MAXQUOTAS; i++) {
if (sb_dqopt(s)->files[i])
- vfs_quota_off_mount(s, i);
+ vfs_quota_off(s, i);
}
if (ms_active_set)
/* Restore the flag back */
OpenPOWER on IntegriCloud