openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: obd: change brw_page->count to unsigned 

Pages count is unsigned. So, change the type accordant usage.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12378
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.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:
Dmitry Eremin 2016-09-18 16:38:28 -04:00 committed by Greg Kroah-Hartman
parent a5d604d763
commit 855b5da50d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/include/obd.h
View File

@ -176,7 +176,7 @@ struct obd_type {
struct brw_page { struct brw_page {
u64 off; u64 off;
struct page *pg; struct page *pg;
int count; unsigned int count;
u32 flag; u32 flag;
}; };

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

@ -1099,7 +1099,7 @@ static int osc_extent_make_ready(const struct lu_env *env,
struct osc_async_page *oap; struct osc_async_page *oap;
struct osc_async_page *last = NULL; struct osc_async_page *last = NULL;
struct osc_object *obj = ext->oe_obj; struct osc_object *obj = ext->oe_obj;
int page_count = 0; unsigned int page_count = 0;
int rc; int rc;
/* we're going to grab page lock, so object lock must not be taken. */ /* we're going to grab page lock, so object lock must not be taken. */
@ -1140,9 +1140,11 @@ static int osc_extent_make_ready(const struct lu_env *env,
* the size of file. * the size of file.
*/ */
if (!(last->oap_async_flags & ASYNC_COUNT_STABLE)) { if (!(last->oap_async_flags & ASYNC_COUNT_STABLE)) {
last->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE); int last_oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE);
LASSERT(last->oap_count > 0);
LASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE); LASSERT(last_oap_count > 0);
LASSERT(last->oap_page_off + last_oap_count <= PAGE_SIZE);
last->oap_count = last_oap_count;
spin_lock(&last->oap_lock); spin_lock(&last->oap_lock);
last->oap_async_flags |= ASYNC_COUNT_STABLE; last->oap_async_flags |= ASYNC_COUNT_STABLE;
spin_unlock(&last->oap_lock); spin_unlock(&last->oap_lock);

2
drivers/staging/lustre/lustre/osc/osc_cl_internal.h
View File

@ -64,7 +64,7 @@ struct osc_io {
/** true if this io is lockless. */ /** true if this io is lockless. */
unsigned int oi_lockless; unsigned int oi_lockless;
/** how many LRU pages are reserved for this IO */ /** how many LRU pages are reserved for this IO */
int oi_lru_reserved; unsigned long oi_lru_reserved;
/** active extents, we know how many bytes is going to be written, /** active extents, we know how many bytes is going to be written,
* so having an active extent will prevent it from being fragmented * so having an active extent will prevent it from being fragmented