Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52f69c5 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Revert "LU-2139 osc: Track and limit "unstable" pages" 



This seems to be causing multiple issues: LU-3274, LU-3277

[The original commit is folded in the large Lusre patch. So we don't
have an exact commit to revert for kernel client -- Peng Tao]
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50dc198a

drivers/staging/lustre/lustre/include/lclient.h

+2 −6
Original line number Diff line number Diff line
@@ -422,10 +422,8 @@ struct lov_stripe_md *ccc_inode_lsm_get(struct inode *inode); 
void ccc_inode_lsm_put(struct inode *inode, struct lov_stripe_md *lsm);



/**

 * Data structure managing a client's cached pages. A count of

 * "unstable" pages is maintained, and an LRU of clean pages is

 * maintained. "unstable" pages are pages pinned by the ptlrpc

 * layer for recovery purposes.

 * Data structure managing a client's cached clean pages. An LRU of

 * pages is maintained, along with other statistics.

 */

struct cl_client_cache {

	atomic_t	ccc_users;    /* # of users (OSCs) of this data */
@@ -434,8 +432,6 @@ struct cl_client_cache { 
	atomic_t	ccc_lru_left; /* # of LRU entries available */

	unsigned long	ccc_lru_max;  /* Max # of LRU entries possible */

	unsigned int	ccc_lru_shrinkers; /* # of threads reclaiming */

	atomic_t	ccc_unstable_nr;    /* # of unstable pages pinned */

	wait_queue_head_t	ccc_unstable_waitq; /* Signaled on BRW commit */

};



#endif /*LCLIENT_H */

drivers/staging/lustre/lustre/include/lustre_net.h

+1 −3
Original line number Diff line number Diff line
@@ -1838,9 +1838,7 @@ struct ptlrpc_request { 
		rq_no_retry_einprogress:1,

		/* allow the req to be sent if the import is in recovery

		 * status */

		rq_allow_replay:1,

		/* bulk request, sent to server, but uncommitted */

		rq_unstable:1;

		rq_allow_replay:1;



	unsigned int rq_nr_resend;

drivers/staging/lustre/lustre/include/obd.h

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ struct lov_obd { 
	proc_dir_entry_t   *lov_pool_proc_entry;

	enum lustre_sec_part    lov_sp_me;



	/* Cached LRU and unstable data from upper layer */

	/* Cached LRU pages from upper layer */

	void		       *lov_cache;



	struct rw_semaphore     lov_notify_lock;

drivers/staging/lustre/lustre/include/obd_support.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ extern int at_early_margin; 
extern int at_extra;

extern unsigned int obd_sync_filter;

extern unsigned int obd_max_dirty_pages;

extern atomic_t obd_unstable_pages;

extern atomic_t obd_dirty_pages;

extern atomic_t obd_dirty_transit_pages;

extern unsigned int obd_alloc_fail_rate;

drivers/staging/lustre/lustre/llite/llite_internal.h

+0 −4
Original line number Diff line number Diff line
@@ -474,10 +474,6 @@ struct ll_sb_info { 


	struct lprocfs_stats     *ll_stats; /* lprocfs stats counter */



	/* Used to track "unstable" pages on a client, and maintain a

	 * LRU list of clean pages. An "unstable" page is defined as

	 * any page which is sent to a server as part of a bulk request,

	 * but is uncommitted to stable storage. */

	struct cl_client_cache    ll_cache;



	struct lprocfs_stats     *ll_ra_stats;