Commit 03ffae90 authored by David Howells's avatar David Howells
Browse files

afs: Disable use of the fscache I/O routines 



Disable use of the fscache I/O routined by the AFS filesystem.  It's about
to transition to passing iov_iters down and fscache is about to have its
I/O path to use iov_iter, so all that needs to change.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Tested-By: default avatarMarc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: linux-cachefs@redhat.com
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/158861209824.340223.1864211542341758994.stgit@warthog.procyon.org.uk/ # rfc
Link: https://lore.kernel.org/r/159465768717.1376105.2229314852486665807.stgit@warthog.procyon.org.uk/
Link: https://lore.kernel.org/r/160588457929.3465195.1730097418904945578.stgit@warthog.procyon.org.uk/ # rfc
Link: https://lore.kernel.org/r/161118143744.1232039.2727898205333669064.stgit@warthog.procyon.org.uk/ # rfc
Link: https://lore.kernel.org/r/161161039077.2537118.7986870854927176905.stgit@warthog.procyon.org.uk/ # v2
Link: https://lore.kernel.org/r/161340403323.1303470.8159439948319423431.stgit@warthog.procyon.org.uk/ # v3
Link: https://lore.kernel.org/r/161539547167.286939.3536238932531122332.stgit@warthog.procyon.org.uk/ # v4
Link: https://lore.kernel.org/r/161653802797.2770958.547311814861545911.stgit@warthog.procyon.org.uk/ # v5
Link: https://lore.kernel.org/r/161789085806.6155.2596146255056027428.stgit@warthog.procyon.org.uk/ # v6
parent 26aaeffc

fs/afs/file.c

+35 −164
Original line number Diff line number Diff line
@@ -202,24 +202,6 @@ void afs_put_read(struct afs_read *req) 
	}

}



#ifdef CONFIG_AFS_FSCACHE

/*

 * deal with notification that a page was read from the cache

 */

static void afs_file_readpage_read_complete(struct page *page,

					    void *data,

					    int error)

{

	_enter("%p,%p,%d", page, data, error);



	/* if the read completes with an error, we just unlock the page and let

	 * the VM reissue the readpage */

	if (!error)

		SetPageUptodate(page);

	unlock_page(page);

}

#endif



static void afs_fetch_data_success(struct afs_operation *op)

{

	struct afs_vnode *vnode = op->file[0].vnode;
@@ -287,33 +269,6 @@ int afs_page_filler(void *data, struct page *page) 
	if (test_bit(AFS_VNODE_DELETED, &vnode->flags))

		goto error;



	/* is it cached? */

#ifdef CONFIG_AFS_FSCACHE

	ret = fscache_read_or_alloc_page(vnode->cache,

					 page,

					 afs_file_readpage_read_complete,

					 NULL,

					 GFP_KERNEL);

#else

	ret = -ENOBUFS;

#endif

	switch (ret) {

		/* read BIO submitted (page in cache) */

	case 0:

		break;



		/* page not yet cached */

	case -ENODATA:

		_debug("cache said ENODATA");

		goto go_on;



		/* page will not be cached */

	case -ENOBUFS:

		_debug("cache said ENOBUFS");



		fallthrough;

	default:

	go_on:

	req = kzalloc(struct_size(req, array, 1), GFP_KERNEL);

	if (!req)

		goto enomem;
@@ -343,11 +298,6 @@ int afs_page_filler(void *data, struct page *page) 
			ret = -ESTALE;

		}



#ifdef CONFIG_AFS_FSCACHE

			fscache_uncache_page(vnode->cache, page);

#endif

			BUG_ON(PageFsCache(page));



		if (ret == -EINTR ||

		    ret == -ENOMEM ||

		    ret == -ERESTARTSYS ||
@@ -357,18 +307,7 @@ int afs_page_filler(void *data, struct page *page) 
	}



	SetPageUptodate(page);



		/* send the page to the cache */

#ifdef CONFIG_AFS_FSCACHE

		if (PageFsCache(page) &&

		    fscache_write_page(vnode->cache, page, vnode->status.size,

				       GFP_KERNEL) != 0) {

			fscache_uncache_page(vnode->cache, page);

			BUG_ON(PageFsCache(page));

		}

#endif

	unlock_page(page);

	}



	_leave(" = 0");

	return 0;
@@ -415,23 +354,10 @@ static int afs_readpage(struct file *file, struct page *page) 
 */

static void afs_readpages_page_done(struct afs_read *req)

{

#ifdef CONFIG_AFS_FSCACHE

	struct afs_vnode *vnode = req->vnode;

#endif

	struct page *page = req->pages[req->index];



	req->pages[req->index] = NULL;

	SetPageUptodate(page);



	/* send the page to the cache */

#ifdef CONFIG_AFS_FSCACHE

	if (PageFsCache(page) &&

	    fscache_write_page(vnode->cache, page, vnode->status.size,

			       GFP_KERNEL) != 0) {

		fscache_uncache_page(vnode->cache, page);

		BUG_ON(PageFsCache(page));

	}

#endif

	unlock_page(page);

	put_page(page);

}
@@ -490,9 +416,6 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, 
		index = page->index;

		if (add_to_page_cache_lru(page, mapping, index,

					  readahead_gfp_mask(mapping))) {

#ifdef CONFIG_AFS_FSCACHE

			fscache_uncache_page(vnode->cache, page);

#endif

			put_page(page);

			break;

		}
@@ -525,9 +448,6 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping, 
	for (i = 0; i < req->nr_pages; i++) {

		page = req->pages[i];

		if (page) {

#ifdef CONFIG_AFS_FSCACHE

			fscache_uncache_page(vnode->cache, page);

#endif

			SetPageError(page);

			unlock_page(page);

		}
@@ -559,37 +479,6 @@ static int afs_readpages(struct file *file, struct address_space *mapping, 
	}



	/* attempt to read as many of the pages as possible */

#ifdef CONFIG_AFS_FSCACHE

	ret = fscache_read_or_alloc_pages(vnode->cache,

					  mapping,

					  pages,

					  &nr_pages,

					  afs_file_readpage_read_complete,

					  NULL,

					  mapping_gfp_mask(mapping));

#else

	ret = -ENOBUFS;

#endif



	switch (ret) {

		/* all pages are being read from the cache */

	case 0:

		BUG_ON(!list_empty(pages));

		BUG_ON(nr_pages != 0);

		_leave(" = 0 [reading all]");

		return 0;



		/* there were pages that couldn't be read from the cache */

	case -ENODATA:

	case -ENOBUFS:

		break;



		/* other error */

	default:

		_leave(" = %d", ret);

		return ret;

	}



	while (!list_empty(pages)) {

		ret = afs_readpages_one(file, mapping, pages);

		if (ret < 0)
@@ -669,17 +558,6 @@ static void afs_invalidatepage(struct page *page, unsigned int offset, 


	BUG_ON(!PageLocked(page));



#ifdef CONFIG_AFS_FSCACHE

	/* we clean up only if the entire page is being invalidated */

	if (offset == 0 && length == PAGE_SIZE) {

		if (PageFsCache(page)) {

			struct afs_vnode *vnode = AFS_FS_I(page->mapping->host);

			fscache_wait_on_page_write(vnode->cache, page);

			fscache_uncache_page(vnode->cache, page);

		}

	}

#endif



	if (PagePrivate(page))

		afs_invalidate_dirty(page, offset, length);
@@ -701,13 +579,6 @@ static int afs_releasepage(struct page *page, gfp_t gfp_flags) 


	/* deny if page is being written to the cache and the caller hasn't

	 * elected to wait */

#ifdef CONFIG_AFS_FSCACHE

	if (!fscache_maybe_release_page(vnode->cache, page, gfp_flags)) {

		_leave(" = F [cache busy]");

		return 0;

	}

#endif



	if (PagePrivate(page)) {

		priv = (unsigned long)detach_page_private(page);

		trace_afs_page_dirty(vnode, tracepoint_string("rel"),

fs/afs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) 
	} __packed key;

	struct afs_vnode_cache_aux aux;



	if (vnode->status.type == AFS_FTYPE_DIR) {

	if (vnode->status.type != AFS_FTYPE_FILE) {

		vnode->cache = NULL;

		return;

	}

fs/afs/write.c

+0 −10
Original line number Diff line number Diff line
@@ -847,9 +847,6 @@ vm_fault_t afs_page_mkwrite(struct vm_fault *vmf) 
	/* Wait for the page to be written to the cache before we allow it to

	 * be modified.  We then assume the entire page will need writing back.

	 */

#ifdef CONFIG_AFS_FSCACHE

	fscache_wait_on_page_write(vnode->cache, vmf->page);

#endif



	if (wait_on_page_writeback_killable(vmf->page))

		return VM_FAULT_RETRY;
@@ -935,12 +932,5 @@ int afs_launder_page(struct page *page) 
	priv = (unsigned long)detach_page_private(page);

	trace_afs_page_dirty(vnode, tracepoint_string("laundered"),

			     page->index, priv);



#ifdef CONFIG_AFS_FSCACHE

	if (PageFsCache(page)) {

		fscache_wait_on_page_write(vnode->cache, page);

		fscache_uncache_page(vnode->cache, page);

	}

#endif

	return ret;

}