Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

torvalds · torvalds · commit e2488ab6ab34 · 2014-10-31T16:18:47.000-07:00
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
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
@@ -1354,13 +1354,6 @@ static int parse_options (char *options, struct super_block *sb,
 					"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
@@ -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
@@ -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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1354,13 +1354,6 @@ static int parse_options (char options, struct super_block sb,`
`1354`	`1354`	`"not specified.");`
`1355`	`1355`	`return 0;`
`1356`	`1356`	`}`
`1357`		`- } else {`
`1358`		`- if (sbi->s_jquota_fmt) {`
`1359`		`- ext3_msg(sb, KERN_ERR, "error: journaled quota format "`
`1360`		`- "specified with no journaling "`
`1361`		`- "enabled.");`
`1362`		`- return 0;`
`1363`		`- }`
`1364`	`1357`	`}`
`1365`	`1358`	`#endif`
`1366`	`1359`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ int dquot_writeback_dquots(struct super_block *sb, int type)`
`634`	`634`	`dqstats_inc(DQST_LOOKUPS);`
`635`	`635`	`err = sb->dq_op->write_dquot(dquot);`
`636`	`636`	`if (!ret && err)`
`637`		`- err = ret;`
	`637`	`+ ret = err;`
`638`	`638`	`dqput(dquot);`
`639`	`639`	`spin_lock(&dq_list_lock);`
`640`	`640`	`}`