commit c5d56d9332e8d2e588c5cf374fcda77910d29900 Author: Brad Spengler Date: Tue Jun 25 17:38:04 2013 -0400 Remove the page array from the vx_cacct struct. It was only ever (improperly) initialized and its initialized/uninitialized values displayed via the /proc cacct entry. This also removes that displaying. diff --git a/include/linux/vserver/cacct_def.h b/include/linux/vserver/cacct_def.h index 6ba394b..1282ae4 100644 --- a/include/linux/vserver/cacct_def.h +++ b/include/linux/vserver/cacct_def.h @@ -15,7 +15,6 @@ struct _vx_sock_acc { struct _vx_cacct { struct _vx_sock_acc sock[VXA_SOCK_SIZE][3]; atomic_long_t slab[8]; - atomic_t page[6][8]; }; #ifdef CONFIG_VSERVER_DEBUG diff --git a/kernel/vserver/cacct_init.h b/kernel/vserver/cacct_init.h index 623f25e..c60146c 100644 --- a/kernel/vserver/cacct_init.h +++ b/kernel/vserver/cacct_init.h @@ -13,9 +13,6 @@ static inline void vx_info_init_cacct(struct _vx_cacct *cacct) } for (i = 0; i < 8; i++) atomic_long_set(&cacct->slab[i], 0); - for (i = 0; i < 5; i++) - for (j = 0; j < 4; j++) - atomic_set(&cacct->page[i][j], 0); } static inline void vx_info_exit_cacct(struct _vx_cacct *cacct) diff --git a/kernel/vserver/cacct_proc.h b/kernel/vserver/cacct_proc.h index 3c2e1bd..01f5618 100644 --- a/kernel/vserver/cacct_proc.h +++ b/kernel/vserver/cacct_proc.h @@ -35,18 +35,6 @@ static inline int vx_info_proc_cacct(struct _vx_cacct *cacct, char *buffer) atomic_long_read(&cacct->slab[2])); length += sprintf(buffer + length, "\n"); - for (i = 0; i < 5; i++) { - length += sprintf(buffer + length, - "page[%d]: %8u %8u %8u %8u\t %8u %8u %8u %8u\n", i, - atomic_read(&cacct->page[i][0]), - atomic_read(&cacct->page[i][1]), - atomic_read(&cacct->page[i][2]), - atomic_read(&cacct->page[i][3]), - atomic_read(&cacct->page[i][4]), - atomic_read(&cacct->page[i][5]), - atomic_read(&cacct->page[i][6]), - atomic_read(&cacct->page[i][7])); - } return length; }