Unverified Commit d271c4b4 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'netfs-lib-20240104' of... 

Merge tag 'netfs-lib-20240104' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull netfs updates from David Howells:

A few follow-up fixes for the netfs work for this cycle.

* tag 'netfs-lib-20240104' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

:
  netfs: Fix proc/fs/fscache symlink to point to "netfs" not "../netfs"
  netfs: Rearrange netfs_io_subrequest to put request pointer first
  9p: Use length of data written to the server in preference to error
  9p: Do a couple of cleanups
  9p: Fix initialisation of netfs_inode for 9p
  cachefiles: Fix __cachefiles_prepare_write()

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents 86fb5941 43833f2b

fs/9p/v9fs_vfs.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct inode *v9fs_alloc_inode(struct super_block *sb); 
void v9fs_free_inode(struct inode *inode);

struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode,

			     dev_t rdev);

void v9fs_set_netfs_context(struct inode *inode);

int v9fs_init_inode(struct v9fs_session_info *v9ses,

		    struct inode *inode, umode_t mode, dev_t rdev);

void v9fs_evict_inode(struct inode *inode);

fs/9p/vfs_addr.c

+12 −12
Original line number Diff line number Diff line
@@ -28,15 +28,12 @@ 


static void v9fs_upload_to_server(struct netfs_io_subrequest *subreq)

{

	struct inode *inode = subreq->rreq->inode;

	struct v9fs_inode __maybe_unused *v9inode = V9FS_I(inode);

	struct p9_fid *fid = subreq->rreq->netfs_priv;

	int err;

	int err, len;



	trace_netfs_sreq(subreq, netfs_sreq_trace_submit);

	p9_client_write(fid, subreq->start, &subreq->io_iter, &err);

	netfs_write_subrequest_terminated(subreq, err < 0 ? err : subreq->len,

					  false);

	len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err);

	netfs_write_subrequest_terminated(subreq, len ?: err, false);

}



static void v9fs_upload_to_server_worker(struct work_struct *work)
@@ -98,15 +95,13 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) 


	if (file) {

		fid = file->private_data;

		BUG_ON(!fid);

		if (!fid)

			goto no_fid;

		p9_fid_get(fid);

	} else {

		fid = v9fs_fid_find_inode(rreq->inode, writing, INVALID_UID, true);

		if (!fid) {

			WARN_ONCE(1, "folio expected an open fid inode->i_private=%p\n",

				  rreq->inode->i_private);

			return -EINVAL;

		}

		if (!fid)

			goto no_fid;

	}



	/* we might need to read from a fid that was opened write-only
@@ -115,6 +110,11 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) 
	WARN_ON(rreq->origin == NETFS_READ_FOR_WRITE && !(fid->mode & P9_ORDWR));

	rreq->netfs_priv = fid;

	return 0;



no_fid:

	WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",

		  rreq->inode->i_ino);

	return -EINVAL;

}



/**

fs/9p/vfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ void v9fs_free_inode(struct inode *inode) 
/*

 * Set parameters for the netfs library

 */

static void v9fs_set_netfs_context(struct inode *inode)

void v9fs_set_netfs_context(struct inode *inode)

{

	struct v9fs_inode *v9inode = V9FS_I(inode);

	netfs_inode_init(&v9inode->netfs, &v9fs_req_ops, true);
@@ -326,8 +326,6 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, 
		err = -EINVAL;

		goto error;

	}



	v9fs_set_netfs_context(inode);

error:

	return err;
@@ -359,6 +357,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t rdev) 
		iput(inode);

		return ERR_PTR(err);

	}

	v9fs_set_netfs_context(inode);

	return inode;

}
@@ -461,6 +460,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, 
		goto error;



	v9fs_stat2inode(st, inode, sb, 0);

	v9fs_set_netfs_context(inode);

	v9fs_cache_inode_get_cookie(inode);

	unlock_new_inode(inode);

	return inode;

fs/9p/vfs_inode_dotl.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, 
		goto error;



	v9fs_stat2inode_dotl(st, inode, 0);

	v9fs_set_netfs_context(inode);

	v9fs_cache_inode_get_cookie(inode);

	retval = v9fs_get_acl(inode, fid);

	if (retval)

fs/cachefiles/io.c

+17 −11
Original line number Diff line number Diff line
@@ -522,16 +522,22 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, 
			       bool no_space_allocated_yet)

{

	struct cachefiles_cache *cache = object->volume->cache;

	loff_t start = *_start, pos;

	size_t len = *_len, down;

	unsigned long long start = *_start, pos;

	size_t len = *_len;

	int ret;



	/* Round to DIO size */

	down = start - round_down(start, PAGE_SIZE);

	*_start = start - down;

	*_len = round_up(down + len, PAGE_SIZE);

	if (down < start || *_len > upper_len)

	start = round_down(*_start, PAGE_SIZE);

	if (start != *_start) {

		kleave(" = -ENOBUFS [down]");

		return -ENOBUFS;

	}

	if (*_len > upper_len) {

		kleave(" = -ENOBUFS [up]");

		return -ENOBUFS;

	}



	*_len = round_up(len, PAGE_SIZE);



	/* We need to work out whether there's sufficient disk space to perform

	 * the write - but we can skip that check if we have space already
@@ -542,7 +548,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, 


	pos = cachefiles_inject_read_error();

	if (pos == 0)

		pos = vfs_llseek(file, *_start, SEEK_DATA);

		pos = vfs_llseek(file, start, SEEK_DATA);

	if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) {

		if (pos == -ENXIO)

			goto check_space; /* Unallocated tail */
@@ -550,7 +556,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, 
					  cachefiles_trace_seek_error);

		return pos;

	}

	if ((u64)pos >= (u64)*_start + *_len)

	if (pos >= start + *_len)

		goto check_space; /* Unallocated region */



	/* We have a block that's at least partially filled - if we're low on
@@ -563,13 +569,13 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, 


	pos = cachefiles_inject_read_error();

	if (pos == 0)

		pos = vfs_llseek(file, *_start, SEEK_HOLE);

		pos = vfs_llseek(file, start, SEEK_HOLE);

	if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) {

		trace_cachefiles_io_error(object, file_inode(file), pos,

					  cachefiles_trace_seek_error);

		return pos;

	}

	if ((u64)pos >= (u64)*_start + *_len)

	if (pos >= start + *_len)

		return 0; /* Fully allocated */



	/* Partially allocated, but insufficient space: cull. */
@@ -577,7 +583,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object, 
	ret = cachefiles_inject_remove_error();

	if (ret == 0)

		ret = vfs_fallocate(file, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

				    *_start, *_len);

				    start, *_len);

	if (ret < 0) {

		trace_cachefiles_io_error(object, file_inode(file), ret,

					  cachefiles_trace_fallocate_error);