Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add last_committed, last_rcvd, and last_xid to the RPC mds_body.
[fs/lustre-release.git]
/
lustre
/
obdfs
/
flushd.c
diff --git
a/lustre/obdfs/flushd.c
b/lustre/obdfs/flushd.c
index
88245b2
..
9ba45ee
100644
(file)
--- a/
lustre/obdfs/flushd.c
+++ b/
lustre/obdfs/flushd.c
@@
-127,13
+127,10
@@
void obdfs_dequeue_pages(struct inode *inode)
struct list_head *tmp;
ENTRY;
struct list_head *tmp;
ENTRY;
- printk ("down0\n");
obd_down(&obdfs_i2sbi(inode)->osi_list_mutex);
obd_down(&obdfs_i2sbi(inode)->osi_list_mutex);
- printk ("got down0\n");
tmp = obdfs_islist(inode);
if ( list_empty(tmp) ) {
CDEBUG(D_INFO, "no dirty pages for inode %ld\n", inode->i_ino);
tmp = obdfs_islist(inode);
if ( list_empty(tmp) ) {
CDEBUG(D_INFO, "no dirty pages for inode %ld\n", inode->i_ino);
- printk ("up 0a");
obd_up(&obdfs_i2sbi(inode)->osi_list_mutex);
EXIT;
return;
obd_up(&obdfs_i2sbi(inode)->osi_list_mutex);
EXIT;
return;
@@
-156,7
+153,6
@@
void obdfs_dequeue_pages(struct inode *inode)
put_page(page);
}
put_page(page);
}
- printk ("up 0b");
obd_up(&obdfs_i2sbi(inode)->osi_list_mutex);
/* decrement inode reference for page cache */
obd_up(&obdfs_i2sbi(inode)->osi_list_mutex);
/* decrement inode reference for page cache */
@@
-164,6
+160,9
@@
void obdfs_dequeue_pages(struct inode *inode)
EXIT;
}
EXIT;
}
+/* This value is not arbitrarily chosen. KIO_STATIC_PAGES from linux/iobuf.h */
+#define MAX_IOVEC (KIO_STATIC_PAGES - 1)
+
/* Remove writeback requests for the superblock */
int obdfs_flush_reqs(struct list_head *inode_list, unsigned long check_time)
{
/* Remove writeback requests for the superblock */
int obdfs_flush_reqs(struct list_head *inode_list, unsigned long check_time)
{
@@
-191,12
+190,9
@@
int obdfs_flush_reqs(struct list_head *inode_list, unsigned long check_time)
sbi = list_entry(inode_list, struct obdfs_sb_info, osi_inodes);
sbi = list_entry(inode_list, struct obdfs_sb_info, osi_inodes);
- printk ("down1\n");
obd_down(&sbi->osi_list_mutex);
obd_down(&sbi->osi_list_mutex);
- printk ("got down1\n");
if ( list_empty(inode_list) ) {
CDEBUG(D_INFO, "list empty\n");
if ( list_empty(inode_list) ) {
CDEBUG(D_INFO, "list empty\n");
- printk ("up 1a\n");
obd_up(&sbi->osi_list_mutex);
EXIT;
return 0;
obd_up(&sbi->osi_list_mutex);
EXIT;
return 0;
@@
-261,7
+257,6
@@
int obdfs_flush_reqs(struct list_head *inode_list, unsigned long check_time)
num_obdos++;
if ( num_io == MAX_IOVEC ) {
num_obdos++;
if ( num_io == MAX_IOVEC ) {
- printk ("up 1b\n");
obd_up(&sbi->osi_list_mutex);
err = obdfs_do_vec_wr(inodes, num_io, num_obdos,
obdos, bufs_per_obdo,
obd_up(&sbi->osi_list_mutex);
err = obdfs_do_vec_wr(inodes, num_io, num_obdos,
obdos, bufs_per_obdo,
@@
-274,16
+269,13
@@
int obdfs_flush_reqs(struct list_head *inode_list, unsigned long check_time)
EXIT;
goto ERR;
}
EXIT;
goto ERR;
}
- printk ("down2\n");
obd_down(&sbi->osi_list_mutex);
obd_down(&sbi->osi_list_mutex);
- printk ("got down2\n");
goto again;
}
}
}
BREAK:
goto again;
}
}
}
BREAK:
- printk ("up 2\n");
obd_up(&sbi->osi_list_mutex);
/* flush any remaining I/Os */
obd_up(&sbi->osi_list_mutex);
/* flush any remaining I/Os */
@@
-301,9
+293,7
@@
BREAK:
* Make sure we don't point at the current inode with tmp
* when we re-init the list on the inode, or we will loop.
*/
* Make sure we don't point at the current inode with tmp
* when we re-init the list on the inode, or we will loop.
*/
- printk ("down3\n");
obd_down(&sbi->osi_list_mutex);
obd_down(&sbi->osi_list_mutex);
- printk ("got down3\n");
tmp = inode_list;
while ( (tmp = tmp->prev) != inode_list ) {
struct obdfs_inode_info *ii;
tmp = inode_list;
while ( (tmp = tmp->prev) != inode_list ) {
struct obdfs_inode_info *ii;
@@
-322,7
+312,6
@@
BREAK:
INIT_LIST_HEAD(obdfs_islist(inode));
}
}
INIT_LIST_HEAD(obdfs_islist(inode));
}
}
- printk ("up 3\n");
obd_up(&sbi->osi_list_mutex);
CDEBUG(D_INFO, "flushed %ld pages in total\n", total_io);
obd_up(&sbi->osi_list_mutex);
CDEBUG(D_INFO, "flushed %ld pages in total\n", total_io);
@@
-388,7
+377,7
@@
static int pupdate(void *unused)
current->pgrp = 1;
strcpy(current->comm, "pupdated");
current->pgrp = 1;
strcpy(current->comm, "pupdated");
-
printk(
"pupdated activated...\n");
+
CDEBUG(D_CACHE,
"pupdated activated...\n");
pupdated.active = 1;
spin_lock_irqsave(¤t->sigmask_lock, flags);
pupdated.active = 1;
spin_lock_irqsave(¤t->sigmask_lock, flags);