ChangeSet 1.1490, 2005/03/29 18:49:25-03:00, [EMAIL PROTECTED]
Cset exclude: [EMAIL PROTECTED]|ChangeSet|20050226095914|25750
fs/ext3/fsync.c | 2 +-
fs/ext3/super.c | 5 ++---
fs/jbd/commit.c | 18 +-----------------
fs/jbd/journal.c | 12 ++----------
fs/jbd/transaction.c | 4 ++--
include/linux/jbd.h | 2 +-
mm/filemap.c | 7 +------
7 files changed, 10 insertions(+), 40 deletions(-)
diff -Nru a/fs/ext3/fsync.c b/fs/ext3/fsync.c
--- a/fs/ext3/fsync.c 2005-03-29 19:02:23 -08:00
+++ b/fs/ext3/fsync.c 2005-03-29 19:02:23 -08:00
@@ -69,7 +69,7 @@
if (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA)
ret |= fsync_inode_data_buffers(inode);
- ret |= ext3_force_commit(inode->i_sb);
+ ext3_force_commit(inode->i_sb);
return ret;
}
diff -Nru a/fs/ext3/super.c b/fs/ext3/super.c
--- a/fs/ext3/super.c 2005-03-29 19:02:23 -08:00
+++ b/fs/ext3/super.c 2005-03-29 19:02:23 -08:00
@@ -1608,13 +1608,12 @@
static int ext3_sync_fs(struct super_block *sb)
{
- int err;
tid_t target;
sb->s_dirt = 0;
target = log_start_commit(EXT3_SB(sb)->s_journal, NULL);
- err = log_wait_commit(EXT3_SB(sb)->s_journal, target);
- return err;
+ log_wait_commit(EXT3_SB(sb)->s_journal, target);
+ return 0;
}
/*
diff -Nru a/fs/jbd/commit.c b/fs/jbd/commit.c
--- a/fs/jbd/commit.c 2005-03-29 19:02:23 -08:00
+++ b/fs/jbd/commit.c 2005-03-29 19:02:23 -08:00
@@ -92,7 +92,7 @@
struct buffer_head *wbuf[64];
int bufs;
int flags;
- int err = 0;
+ int err;
unsigned long blocknr;
char *tagp = NULL;
journal_header_t *header;
@@ -299,8 +299,6 @@
spin_unlock(&journal_datalist_lock);
unlock_journal(journal);
wait_on_buffer(bh);
- if (unlikely(!buffer_uptodate(bh)))
- err = -EIO;
/* the journal_head may have been removed now */
lock_journal(journal);
goto write_out_data;
@@ -328,8 +326,6 @@
spin_unlock(&journal_datalist_lock);
unlock_journal(journal);
wait_on_buffer(bh);
- if (unlikely(!buffer_uptodate(bh)))
- err = -EIO;
lock_journal(journal);
spin_lock(&journal_datalist_lock);
continue; /* List may have changed */
@@ -355,9 +351,6 @@
}
spin_unlock(&journal_datalist_lock);
- if (err)
- __journal_abort_hard(journal);
-
/*
* If we found any dirty or locked buffers, then we should have
* looped back up to the write_out_data label. If there weren't
@@ -548,8 +541,6 @@
if (buffer_locked(bh)) {
unlock_journal(journal);
wait_on_buffer(bh);
- if (unlikely(!buffer_uptodate(bh)))
- err = -EIO;
lock_journal(journal);
goto wait_for_iobuf;
}
@@ -611,8 +602,6 @@
if (buffer_locked(bh)) {
unlock_journal(journal);
wait_on_buffer(bh);
- if (unlikely(!buffer_uptodate(bh)))
- err = -EIO;
lock_journal(journal);
goto wait_for_ctlbuf;
}
@@ -661,8 +650,6 @@
bh->b_end_io = journal_end_buffer_io_sync;
submit_bh(WRITE, bh);
wait_on_buffer(bh);
- if (unlikely(!buffer_uptodate(bh)))
- err = -EIO;
put_bh(bh); /* One for getblk() */
journal_unlock_journal_head(descriptor);
}
@@ -674,9 +661,6 @@
skip_commit: /* The journal should be unlocked by now. */
- if (err)
- __journal_abort_hard(journal);
-
/* Call any callbacks that had been registered for handles in this
* transaction. It is up to the callback to free any allocated
* memory.
diff -Nru a/fs/jbd/journal.c b/fs/jbd/journal.c
--- a/fs/jbd/journal.c 2005-03-29 19:02:23 -08:00
+++ b/fs/jbd/journal.c 2005-03-29 19:02:23 -08:00
@@ -582,10 +582,8 @@
* Wait for a specified commit to complete.
* The caller may not hold the journal lock.
*/
-int log_wait_commit (journal_t *journal, tid_t tid)
+void log_wait_commit (journal_t *journal, tid_t tid)
{
- int err = 0;
-
lock_kernel();
#ifdef CONFIG_JBD_DEBUG
lock_journal(journal);
@@ -602,12 +600,6 @@
sleep_on(&journal->j_wait_done_commit);
}
unlock_kernel();
-
- if (unlikely(is_journal_aborted(journal))) {
- printk(KERN_EMERG "journal commit I/O error\n");
- err = -EIO;
- }
- return err;
}
/*
@@ -1334,7 +1326,7 @@
/* Wait for the log commit to complete... */
if (transaction)
- err = log_wait_commit(journal, transaction->t_tid);
+ log_wait_commit(journal, transaction->t_tid);
/* ...and flush everything in the log out to disk. */
lock_journal(journal);
diff -Nru a/fs/jbd/transaction.c b/fs/jbd/transaction.c
--- a/fs/jbd/transaction.c 2005-03-29 19:02:23 -08:00
+++ b/fs/jbd/transaction.c 2005-03-29 19:02:23 -08:00
@@ -1484,7 +1484,7 @@
* to wait for the commit to complete.
*/
if (handle->h_sync && !(current->flags & PF_MEMALLOC))
- err = log_wait_commit(journal, tid);
+ log_wait_commit(journal, tid);
}
kfree(handle);
return err;
@@ -1509,7 +1509,7 @@
goto out;
}
handle->h_sync = 1;
- ret = journal_stop(handle);
+ journal_stop(handle);
out:
unlock_kernel();
return ret;
diff -Nru a/include/linux/jbd.h b/include/linux/jbd.h
--- a/include/linux/jbd.h 2005-03-29 19:02:23 -08:00
+++ b/include/linux/jbd.h 2005-03-29 19:02:23 -08:00
@@ -848,7 +848,7 @@
extern int log_space_left (journal_t *); /* Called with journal locked */
extern tid_t log_start_commit (journal_t *, transaction_t *);
-extern int log_wait_commit (journal_t *, tid_t);
+extern void log_wait_commit (journal_t *, tid_t);
extern int log_do_checkpoint (journal_t *, int);
extern void log_wait_for_space(journal_t *, int nblocks);
diff -Nru a/mm/filemap.c b/mm/filemap.c
--- a/mm/filemap.c 2005-03-29 19:02:23 -08:00
+++ b/mm/filemap.c 2005-03-29 19:02:23 -08:00
@@ -3261,12 +3261,7 @@
status = generic_osync_inode(inode,
OSYNC_METADATA|OSYNC_DATA);
}
- /*
- * generic_osync_inode always returns 0 or negative value.
- * So 'status < written' is always true, and written should
- * be returned if status >= 0.
- */
- err = (status < 0) ? status : written;
+ err = written ? written : status;
out:
return err;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
