From b4c70818d440b25a83710288edeb177513c25283 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Wed, 21 Jul 2010 14:22:21 +0200 Subject: [PATCH] --- yaml --- r: 206283 b: refs/heads/master c: 43d2932d88e4ab776dd388c20b003ebd5e1d1f1f h: refs/heads/master i: 206281: 323a5e79fd7c694b3cfb1c53691a3de67adad3e7 206279: 96126e20ad81a7c4f8c9fc55bc5b42d0ae3d696b v: v3 --- [refs] | 2 +- trunk/fs/quota/dquot.c | 2 +- trunk/include/linux/quotaops.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ac1bc2d0cc6c..aa140cc10a56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb5ffb0e160c93c3fe08ab83845eb9a2768af812 +refs/heads/master: 43d2932d88e4ab776dd388c20b003ebd5e1d1f1f diff --git a/trunk/fs/quota/dquot.c b/trunk/fs/quota/dquot.c index b171221000fa..a7023bcfae4f 100644 --- a/trunk/fs/quota/dquot.c +++ b/trunk/fs/quota/dquot.c @@ -1992,7 +1992,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) truncate_inode_pages(&toputinode[cnt]->i_data, 0); mutex_unlock(&toputinode[cnt]->i_mutex); - mark_inode_dirty(toputinode[cnt]); + mark_inode_dirty_sync(toputinode[cnt]); } mutex_unlock(&dqopt->dqonoff_mutex); } diff --git a/trunk/include/linux/quotaops.h b/trunk/include/linux/quotaops.h index 4881b49b1a9a..d50ba858cfe0 100644 --- a/trunk/include/linux/quotaops.h +++ b/trunk/include/linux/quotaops.h @@ -266,7 +266,7 @@ static inline int dquot_alloc_space_nodirty(struct inode *inode, qsize_t nr) static inline void dquot_alloc_space_nofail(struct inode *inode, qsize_t nr) { __dquot_alloc_space(inode, nr, DQUOT_SPACE_WARN|DQUOT_SPACE_NOFAIL); - mark_inode_dirty(inode); + mark_inode_dirty_sync(inode); } static inline int dquot_alloc_space(struct inode *inode, qsize_t nr) @@ -275,7 +275,7 @@ static inline int dquot_alloc_space(struct inode *inode, qsize_t nr) ret = dquot_alloc_space_nodirty(inode, nr); if (!ret) - mark_inode_dirty(inode); + mark_inode_dirty_sync(inode); return ret; } @@ -305,7 +305,7 @@ static inline int dquot_prealloc_block(struct inode *inode, qsize_t nr) ret = dquot_prealloc_block_nodirty(inode, nr); if (!ret) - mark_inode_dirty(inode); + mark_inode_dirty_sync(inode); return ret; } @@ -321,7 +321,7 @@ static inline int dquot_claim_block(struct inode *inode, qsize_t nr) ret = dquot_claim_space_nodirty(inode, nr << inode->i_blkbits); if (!ret) - mark_inode_dirty(inode); + mark_inode_dirty_sync(inode); return ret; } @@ -333,7 +333,7 @@ static inline void dquot_free_space_nodirty(struct inode *inode, qsize_t nr) static inline void dquot_free_space(struct inode *inode, qsize_t nr) { dquot_free_space_nodirty(inode, nr); - mark_inode_dirty(inode); + mark_inode_dirty_sync(inode); } static inline void dquot_free_block_nodirty(struct inode *inode, qsize_t nr)