Commit ad55c575 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] misc fixes

- remove unneeded loglevel manipulation in journal_dirty_metadata()

- remove crud which was acidentally added to blkmtd.c

- remove unused vars in mxser.c (Vinay K Nallamothu <vinay-rc@naturesoft.net>)

- PF_LESS_THROTTLE was using the wrong bit (Joe Korty <joe.korty@ccur.com>)

- unused var in cyclades.c ("Krishnakumar. R" <krishnakumar@naturesoft.net>)
parent 0633c67e
...@@ -5665,7 +5665,7 @@ void ...@@ -5665,7 +5665,7 @@ void
cy_cleanup_module(void) cy_cleanup_module(void)
{ {
int i; int i;
int e1, e2; int e1;
unsigned long flags; unsigned long flags;
#ifndef CONFIG_CYZ_INTR #ifndef CONFIG_CYZ_INTR
......
...@@ -498,7 +498,6 @@ static int __init mxser_module_init(void) ...@@ -498,7 +498,6 @@ static int __init mxser_module_init(void)
{ {
int i, m, retval, b; int i, m, retval, b;
int n, index; int n, index;
int ret1, ret2;
struct mxser_hwconf hwconf; struct mxser_hwconf hwconf;
mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1); mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1);
......
...@@ -710,7 +710,7 @@ static int blkmtd_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -710,7 +710,7 @@ static int blkmtd_write(struct mtd_info *mtd, loff_t to, size_t len,
struct page **pages; struct page **pages;
int pagecnt = 0; int pagecnt = 0;
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
21 e3
*retlen = 0; *retlen = 0;
DEBUG(2, "blkmtd: write: dev = `%s' to = %ld len = %d buf = %p\n", DEBUG(2, "blkmtd: write: dev = `%s' to = %ld len = %d buf = %p\n",
bdevname(rawdevice->binding, b), (long int)to, len, buf); bdevname(rawdevice->binding, b), (long int)to, len, buf);
......
...@@ -1088,7 +1088,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1088,7 +1088,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
transaction_t *transaction = handle->h_transaction; transaction_t *transaction = handle->h_transaction;
journal_t *journal = transaction->t_journal; journal_t *journal = transaction->t_journal;
struct journal_head *jh = bh2jh(bh); struct journal_head *jh = bh2jh(bh);
int console_loglevel_saved = console_loglevel;
jbd_debug(5, "journal_head %p\n", jh); jbd_debug(5, "journal_head %p\n", jh);
JBUFFER_TRACE(jh, "entry"); JBUFFER_TRACE(jh, "entry");
...@@ -1147,7 +1146,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1147,7 +1146,6 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
out: out:
JBUFFER_TRACE(jh, "exit"); JBUFFER_TRACE(jh, "exit");
console_loglevel = console_loglevel_saved;
return 0; return 0;
} }
......
...@@ -485,7 +485,7 @@ do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0) ...@@ -485,7 +485,7 @@ do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0)
#define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */
#define PF_KSWAPD 0x00040000 /* I am kswapd */ #define PF_KSWAPD 0x00040000 /* I am kswapd */
#define PF_SWAPOFF 0x00080000 /* I am in swapoff */ #define PF_SWAPOFF 0x00080000 /* I am in swapoff */
#define PF_LESS_THROTTLE 0x01000000 /* Throttle me less: I clena memory */ #define PF_LESS_THROTTLE 0x00100000 /* Throttle me less: I clean memory */
#define PF_SYNCWRITE 0x00200000 /* I am doing a sync write */ #define PF_SYNCWRITE 0x00200000 /* I am doing a sync write */
#define PF_READAHEAD 0x00400000 /* I am doing read-ahead */ #define PF_READAHEAD 0x00400000 /* I am doing read-ahead */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment