mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 18:04:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: llite: reset writeback index in ll_writepages

Browse Source 
Otherwise after one round the writeback index will become beyond
the file size and ->writepages() turns into an empty operation.

Also, a safety guard is added to limit the wait time for grant to
10 minutes(take recovery into consideration) at maximum in the
osc_enter_cache() function. Otherwise, EDQUOT will be returned to
the applications to start sync write.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3416
Reviewed-on: http://review.whamcloud.com/6554
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jinshan Xiong
2016-04-27 18:20:53 -04:00
committed by Greg Kroah-Hartman
parent 610cc3a49f
commit c355855359
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/lustre/llite/rw.c
View File

@@ -1105,8 +1105,9 @@ int ll_writepages(struct address_space *mapping, struct writeback_control *wbc)
if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) {
if (end == OBD_OBJECT_EOF)
end = i_size_read(inode);
mapping->writeback_index = (end >> PAGE_SHIFT) + 1;
mapping->writeback_index = 0;
else
mapping->writeback_index = (end >> PAGE_SHIFT) + 1;
}
return result;
}

32
drivers/staging/lustre/lustre/osc/osc_cache.c
View File

@@ -1383,15 +1383,19 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
return 0;
}
#define OSC_DUMP_GRANT(cli, fmt, args...) do { \
#define OSC_DUMP_GRANT(lvl, cli, fmt, args...) do { \
struct client_obd *__tmp = (cli); \
CDEBUG(D_CACHE, "%s: { dirty: %ld/%ld dirty_pages: %d/%d " \
"dropped: %ld avail: %ld, reserved: %ld, flight: %d } " fmt, \
CDEBUG(lvl, "%s: grant { dirty: %ld/%ld dirty_pages: %d/%d " \
"dropped: %ld avail: %ld, reserved: %ld, flight: %d } " \
"lru {in list: %d, left: %d, waiters: %d }" fmt, \
__tmp->cl_import->imp_obd->obd_name, \
__tmp->cl_dirty, __tmp->cl_dirty_max, \
atomic_read(&obd_dirty_pages), obd_max_dirty_pages, \
__tmp->cl_lost_grant, __tmp->cl_avail_grant, \
__tmp->cl_reserved_grant, __tmp->cl_w_in_flight, ##args); \
__tmp->cl_reserved_grant, __tmp->cl_w_in_flight, \
atomic_read(&__tmp->cl_lru_in_list), \
atomic_read(&__tmp->cl_lru_busy), \
atomic_read(&__tmp->cl_lru_shrinkers), ##args); \
} while (0)
/* caller must hold loi_list_lock */
@@ -1531,7 +1535,7 @@ static int osc_enter_cache_try(struct client_obd *cli,
{
int rc;
OSC_DUMP_GRANT(cli, "need:%d.\n", bytes);
OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);
rc = osc_reserve_grant(cli, bytes);
if (rc < 0)
@@ -1576,10 +1580,11 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
struct osc_object *osc = oap->oap_obj;
struct lov_oinfo *loi = osc->oo_oinfo;
struct osc_cache_waiter ocw;
struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
struct l_wait_info lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(600), NULL,
LWI_ON_SIGNAL_NOOP, NULL);
int rc = -EDQUOT;
OSC_DUMP_GRANT(cli, "need:%d.\n", bytes);
OSC_DUMP_GRANT(D_CACHE, cli, "need:%d.\n", bytes);
spin_lock(&cli->cl_loi_list_lock);
@@ -1623,8 +1628,15 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
spin_lock(&cli->cl_loi_list_lock);
/* l_wait_event is interrupted by signal */
/* l_wait_event is interrupted by signal, or timed out */
if (rc < 0) {
if (rc == -ETIMEDOUT) {
OSC_DUMP_GRANT(D_ERROR, cli,
"try to reserve %d.\n", bytes);
osc_extent_tree_dump(D_ERROR, osc);
rc = -EDQUOT;
}
list_del_init(&ocw.ocw_entry);
goto out;
}
@@ -1641,7 +1653,7 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,
}
out:
spin_unlock(&cli->cl_loi_list_lock);
OSC_DUMP_GRANT(cli, "returned %d.\n", rc);
OSC_DUMP_GRANT(D_CACHE, cli, "returned %d.\n", rc);
return rc;
}
@@ -3014,7 +3026,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,
result = rc;
}
OSC_IO_DEBUG(obj, "cache page out.\n");
OSC_IO_DEBUG(obj, "pageout [%lu, %lu], %d.\n", start, end, result);
return result;
}