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

staging/lustre: Get rid of ll_pagevec_ macros 



They are noop anyways.

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d5be52f

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+0 −5
Original line number Diff line number Diff line
@@ -69,11 +69,6 @@ 
# define inode_dio_read(i)		atomic_inc(&(i)->i_dio_count)

/* inode_dio_done(i) use as-is for read unlock */



#define ll_pagevec_init(pv, cold)       do {} while (0)

#define ll_pagevec_add(pv, pg)	  (0)

#define ll_pagevec_lru_add_file(pv)     do {} while (0)





#ifndef QUOTA_OK

# define QUOTA_OK 0

#endif

drivers/staging/lustre/lustre/llite/dir.c

+0 −4
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ static int ll_dir_filler(void *_hash, struct page *page0) 


	CDEBUG(D_VFSTRACE, "read %d/%d pages\n", nrdpgs, npages);



	ll_pagevec_init(&lru_pvec, 0);

	for (i = 1; i < npages; i++) {

		unsigned long offset;

		int ret;
@@ -228,15 +227,12 @@ static int ll_dir_filler(void *_hash, struct page *page0) 
					    GFP_KERNEL);

		if (ret == 0) {

			unlock_page(page);

			if (ll_pagevec_add(&lru_pvec, page) == 0)

				ll_pagevec_lru_add_file(&lru_pvec);

		} else {

			CDEBUG(D_VFSTRACE, "page %lu add to page cache failed: %d\n",

			       offset, ret);

		}

		page_cache_release(page);

	}

	ll_pagevec_lru_add_file(&lru_pvec);



	if (page_pool != &page0)

		kfree(page_pool);