Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-13
-7
fs/ext3/super.c
-7
fs/ext3/super.c
···
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;
+2
-5
fs/jbd/revoke.c
+2
-5
fs/jbd/revoke.c
···
93
93
#include <linux/bio.h>
94
94
#endif
95
95
#include <linux/log2.h>
96
+
#include <linux/hash.h>
96
97
97
98
static struct kmem_cache *revoke_record_cache;
98
99
static struct kmem_cache *revoke_table_cache;
···
130
129
131
130
/* Utility functions to maintain the revoke table */
132
131
133
-
/* Borrowed from buffer.c: this is a tried and tested block hash function */
134
132
static inline int hash(journal_t *journal, unsigned int block)
135
133
{
136
134
struct jbd_revoke_table_s *table = journal->j_revoke;
137
-
int hash_shift = table->hash_shift;
138
135
139
-
return ((block << (hash_shift - 6)) ^
140
-
(block >> 13) ^
141
-
(block << (hash_shift - 12))) & (table->hash_size - 1);
136
+
return hash_32(block, table->hash_shift);
142
137
}
143
138
144
139
static int insert_revoke_hash(journal_t *journal, unsigned int blocknr,