projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[powerpc.git]
/
fs
/
jbd2
/
journal.c
diff --git
a/fs/jbd2/journal.c
b/fs/jbd2/journal.c
index
259e836
..
44fc32b
100644
(file)
--- a/
fs/jbd2/journal.c
+++ b/
fs/jbd2/journal.c
@@
-31,7
+31,7
@@
#include <linux/smp_lock.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>
#include <linux/init.h>
#include <linux/mm.h>
-#include <linux/
suspend
.h>
+#include <linux/
freezer
.h>
#include <linux/pagemap.h>
#include <linux/kthread.h>
#include <linux/poison.h>
#include <linux/pagemap.h>
#include <linux/kthread.h>
#include <linux/poison.h>
@@
-271,7
+271,7
@@
static void journal_kill_thread(journal_t *journal)
int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
struct journal_head *jh_in,
struct journal_head **jh_out,
int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
struct journal_head *jh_in,
struct journal_head **jh_out,
-
sector_t
blocknr)
+
unsigned long long
blocknr)
{
int need_copy_out = 0;
int done_copy_out = 0;
{
int need_copy_out = 0;
int done_copy_out = 0;
@@
-555,7
+555,7
@@
int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
* Log buffer allocation routines:
*/
* Log buffer allocation routines:
*/
-int jbd2_journal_next_log_block(journal_t *journal,
sector_t
*retp)
+int jbd2_journal_next_log_block(journal_t *journal,
unsigned long long
*retp)
{
unsigned long blocknr;
{
unsigned long blocknr;
@@
-579,10
+579,10
@@
int jbd2_journal_next_log_block(journal_t *journal, sector_t *retp)
* ready.
*/
int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
* ready.
*/
int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
-
sector_t
*retp)
+
unsigned long long
*retp)
{
int err = 0;
{
int err = 0;
-
sector_t
ret;
+
unsigned long long
ret;
if (journal->j_inode) {
ret = bmap(journal->j_inode, blocknr);
if (journal->j_inode) {
ret = bmap(journal->j_inode, blocknr);
@@
-618,7
+618,7
@@
int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
struct journal_head *jbd2_journal_get_descriptor_buffer(journal_t *journal)
{
struct buffer_head *bh;
struct journal_head *jbd2_journal_get_descriptor_buffer(journal_t *journal)
{
struct buffer_head *bh;
-
sector_t
blocknr;
+
unsigned long long
blocknr;
int err;
err = jbd2_journal_next_log_block(journal, &blocknr);
int err;
err = jbd2_journal_next_log_block(journal, &blocknr);
@@
-706,7
+706,7
@@
fail:
*/
journal_t * jbd2_journal_init_dev(struct block_device *bdev,
struct block_device *fs_dev,
*/
journal_t * jbd2_journal_init_dev(struct block_device *bdev,
struct block_device *fs_dev,
-
sector_t
start, int len, int blocksize)
+
unsigned long long
start, int len, int blocksize)
{
journal_t *journal = journal_init_common();
struct buffer_head *bh;
{
journal_t *journal = journal_init_common();
struct buffer_head *bh;
@@
-725,6
+725,7
@@
journal_t * jbd2_journal_init_dev(struct block_device *bdev,
__FUNCTION__);
kfree(journal);
journal = NULL;
__FUNCTION__);
kfree(journal);
journal = NULL;
+ goto out;
}
journal->j_dev = bdev;
journal->j_fs_dev = fs_dev;
}
journal->j_dev = bdev;
journal->j_fs_dev = fs_dev;
@@
-735,7
+736,7
@@
journal_t * jbd2_journal_init_dev(struct block_device *bdev,
J_ASSERT(bh != NULL);
journal->j_sb_buffer = bh;
journal->j_superblock = (journal_superblock_t *)bh->b_data;
J_ASSERT(bh != NULL);
journal->j_sb_buffer = bh;
journal->j_superblock = (journal_superblock_t *)bh->b_data;
-
+out:
return journal;
}
return journal;
}
@@
-753,7
+754,7
@@
journal_t * jbd2_journal_init_inode (struct inode *inode)
journal_t *journal = journal_init_common();
int err;
int n;
journal_t *journal = journal_init_common();
int err;
int n;
-
sector_t
blocknr;
+
unsigned long long
blocknr;
if (!journal)
return NULL;
if (!journal)
return NULL;
@@
-819,7
+820,7
@@
static void journal_fail_superblock (journal_t *journal)
static int journal_reset(journal_t *journal)
{
journal_superblock_t *sb = journal->j_superblock;
static int journal_reset(journal_t *journal)
{
journal_superblock_t *sb = journal->j_superblock;
-
sector_t
first, last;
+
unsigned long long
first, last;
first = be32_to_cpu(sb->s_first);
last = be32_to_cpu(sb->s_maxlen);
first = be32_to_cpu(sb->s_first);
last = be32_to_cpu(sb->s_maxlen);
@@
-853,7
+854,7
@@
static int journal_reset(journal_t *journal)
**/
int jbd2_journal_create(journal_t *journal)
{
**/
int jbd2_journal_create(journal_t *journal)
{
-
sector_t
blocknr;
+
unsigned long long
blocknr;
struct buffer_head *bh;
journal_superblock_t *sb;
int i, err;
struct buffer_head *bh;
journal_superblock_t *sb;
int i, err;
@@
-1640,7
+1641,7
@@
void * __jbd2_kmalloc (const char *where, size_t size, gfp_t flags, int retry)
#define JBD_MAX_SLABS 5
#define JBD_SLAB_INDEX(size) (size >> 11)
#define JBD_MAX_SLABS 5
#define JBD_SLAB_INDEX(size) (size >> 11)
-static
kmem_cache_t
*jbd_slab[JBD_MAX_SLABS];
+static
struct kmem_cache
*jbd_slab[JBD_MAX_SLABS];
static const char *jbd_slab_names[JBD_MAX_SLABS] = {
"jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
};
static const char *jbd_slab_names[JBD_MAX_SLABS] = {
"jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
};
@@
-1703,7
+1704,7
@@
void jbd2_slab_free(void *ptr, size_t size)
/*
* Journal_head storage management
*/
/*
* Journal_head storage management
*/
-static
kmem_cache_t
*jbd2_journal_head_cache;
+static
struct kmem_cache
*jbd2_journal_head_cache;
#ifdef CONFIG_JBD_DEBUG
static atomic_t nr_journal_heads = ATOMIC_INIT(0);
#endif
#ifdef CONFIG_JBD_DEBUG
static atomic_t nr_journal_heads = ATOMIC_INIT(0);
#endif
@@
-2006,7
+2007,7
@@
static void __exit jbd2_remove_jbd_proc_entry(void)
#endif
#endif
-
kmem_cache_t
*jbd2_handle_cache;
+
struct kmem_cache
*jbd2_handle_cache;
static int __init journal_init_handle_cache(void)
{
static int __init journal_init_handle_cache(void)
{