diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 16:18:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 16:18:47 -0700 |
| commit | e2488ab6ab34cddccda5e839eaeb37f72701830e (patch) | |
| tree | 5671f999ee9eb88c38bf6718b3857cfecd3c851d /fs | |
| parent | 89453379aaf0608253124057df6cd8ac63948135 (diff) | |
| parent | 3c9cafe05ff002eb84d438a02f3c8d468720463b (diff) | |
| download | op-kernel-dev-e2488ab6ab34cddccda5e839eaeb37f72701830e.zip op-kernel-dev-e2488ab6ab34cddccda5e839eaeb37f72701830e.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota and ext3 fixes from Jan Kara.
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fs, jbd: use a more generic hash function
quota: Properly return errors from dquot_writeback_dquots()
ext3: Don't check quota format when there are no quota files
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext3/super.c | 7 | ||||
| -rw-r--r-- | fs/jbd/revoke.c | 7 | ||||
| -rw-r--r-- | fs/quota/dquot.c | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 7015db0..eb742d0 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -1354,13 +1354,6 @@ set_qf_format: "not specified."); return 0; } - } else { - if (sbi->s_jquota_fmt) { - ext3_msg(sb, KERN_ERR, "error: journaled quota format " - "specified with no journaling " - "enabled."); - return 0; - } } #endif return 1; diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index 8898bbd..dcead63 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c @@ -93,6 +93,7 @@ #include <linux/bio.h> #endif #include <linux/log2.h> +#include <linux/hash.h> static struct kmem_cache *revoke_record_cache; static struct kmem_cache *revoke_table_cache; @@ -129,15 +130,11 @@ static void flush_descriptor(journal_t *, struct journal_head *, int, int); /* Utility functions to maintain the revoke table */ -/* Borrowed from buffer.c: this is a tried and tested block hash function */ static inline int hash(journal_t *journal, unsigned int block) { struct jbd_revoke_table_s *table = journal->j_revoke; - int hash_shift = table->hash_shift; - return ((block << (hash_shift - 6)) ^ - (block >> 13) ^ - (block << (hash_shift - 12))) & (table->hash_size - 1); + return hash_32(block, table->hash_shift); } static int insert_revoke_hash(journal_t *journal, unsigned int blocknr, diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 8b663b2..6b45272 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -634,7 +634,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type) dqstats_inc(DQST_LOOKUPS); err = sb->dq_op->write_dquot(dquot); if (!ret && err) - err = ret; + ret = err; dqput(dquot); spin_lock(&dq_list_lock); } |
