From 4e10dc6e409f4a0e1e01b2ab1ce78b24ecba22c3 Mon Sep 17 00:00:00 2001 From: zab Date: Tue, 23 Sep 2003 22:15:23 +0000 Subject: [PATCH] - back out the mdc close deferral changes (bug 1883) until mds size management is ready and really needs it and both the txtbsy (bug 2003) and mdc semaphore regressions (bug 2008) are taken care of. --- lustre/llite/llite_lib.c | 3 --- lustre/llite/rw24.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index b025ea9..c78c7ec 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -123,9 +123,6 @@ void ll_lli_init(struct ll_inode_info *lli) sema_init(&lli->lli_open_sem, 1); lli->lli_flags = 0; lli->lli_maxbytes = PAGE_CACHE_MAXBYTES; - INIT_LIST_HEAD(&lli->lli_dirty_ocps); - INIT_LIST_HEAD(&lli->lli_pending_close); - spin_lock_init(&lli->lli_lock); } int ll_fill_super(struct super_block *sb, void *data, int silent) diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c index f90f5a8..ce1ea6c 100644 --- a/lustre/llite/rw24.c +++ b/lustre/llite/rw24.c @@ -56,7 +56,6 @@ void ll_complete_writepage_24(struct obd_client_page *ocp, int rc) { struct page *page = ocp->ocp_page; - struct inode *inode = page->mapping->host; LASSERT(page->private == (unsigned long)ocp); LASSERT(PageLocked(page)); @@ -66,18 +65,9 @@ void ll_complete_writepage_24(struct obd_client_page *ocp, int rc) page->index, rc); SetPageError(page); } - - ll_ocp_clean(ll_i2info(inode), ocp); - ocp->ocp_flags &= ~OCP_IO_READY; unlock_page(page); page_cache_release(page); - - /* XXX we might have just finished writeback on our last dirty - * page and need to finish deferred mdc_close.. doing this in - * the osc's rpc context makes me nervous. could have another - * thread or use keventd, or whatever. */ - ll_check_inode_clean(inode, 0); } static int ll_writepage_24(struct page *page) -- 1.8.3.1