Commit 966cc171 authored by David Howells's avatar David Howells Committed by Steve French
Browse files

cifs: Share server EOF pos with netfslib 



Use cifsi->netfs_ctx.remote_i_size instead of cifsi->server_eof so that
netfslib can refer to it to.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Shyam Prasad N <nspmangalore@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
cc: linux-cachefs@redhat.com
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 8deb05c8

fs/smb/client/cifsfs.c

+14 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ cifs_alloc_inode(struct super_block *sb) 
	spin_lock_init(&cifs_inode->writers_lock);

	cifs_inode->writers = 0;

	cifs_inode->netfs.inode.i_blkbits = 14;  /* 2**14 = CIFS_MAX_MSGSIZE */

	cifs_inode->server_eof = 0;

	cifs_inode->netfs.remote_i_size = 0;

	cifs_inode->uniqueid = 0;

	cifs_inode->createtime = 0;

	cifs_inode->epoch = 0;
@@ -1380,6 +1380,7 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, 
	struct inode *src_inode = file_inode(src_file);

	struct inode *target_inode = file_inode(dst_file);

	struct cifsInodeInfo *src_cifsi = CIFS_I(src_inode);

	struct cifsInodeInfo *target_cifsi = CIFS_I(target_inode);

	struct cifsFileInfo *smb_file_src;

	struct cifsFileInfo *smb_file_target;

	struct cifs_tcon *src_tcon;
@@ -1428,7 +1429,7 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, 
	 * Advance the EOF marker after the flush above to the end of the range

	 * if it's short of that.

	 */

	if (src_cifsi->server_eof < off + len) {

	if (src_cifsi->netfs.remote_i_size < off + len) {

		rc = cifs_precopy_set_eof(src_inode, src_cifsi, src_tcon, xid, off + len);

		if (rc < 0)

			goto unlock;
@@ -1452,12 +1453,22 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, 
	/* Discard all the folios that overlap the destination region. */

	truncate_inode_pages_range(&target_inode->i_data, fstart, fend);



	fscache_invalidate(cifs_inode_cookie(target_inode), NULL,

			   i_size_read(target_inode), 0);



	rc = file_modified(dst_file);

	if (!rc) {

		rc = target_tcon->ses->server->ops->copychunk_range(xid,

			smb_file_src, smb_file_target, off, len, destoff);

		if (rc > 0 && destoff + rc > i_size_read(target_inode))

		if (rc > 0 && destoff + rc > i_size_read(target_inode)) {

			truncate_setsize(target_inode, destoff + rc);

			netfs_resize_file(&target_cifsi->netfs,

					  i_size_read(target_inode), true);

			fscache_resize_cookie(cifs_inode_cookie(target_inode),

					      i_size_read(target_inode));

		}

		if (rc > 0 && destoff + rc > target_cifsi->netfs.zero_point)

			target_cifsi->netfs.zero_point = destoff + rc;

	}



	file_accessed(src_file);

fs/smb/client/cifsglob.h

+0 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,6 @@ struct cifsInodeInfo { 
	spinlock_t writers_lock;

	unsigned int writers;		/* Number of writers on this inode */

	unsigned long time;		/* jiffies of last update of inode */

	u64  server_eof;		/* current file size on server -- protected by i_lock */

	u64  uniqueid;			/* server inode number */

	u64  createtime;		/* creation time on server */

	__u8 lease_key[SMB2_LEASE_KEY_SIZE];	/* lease key for this inode */

fs/smb/client/file.c

+4 −4
Original line number Diff line number Diff line
@@ -2120,8 +2120,8 @@ cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset, 
{

	loff_t end_of_write = offset + bytes_written;



	if (end_of_write > cifsi->server_eof)

		cifsi->server_eof = end_of_write;

	if (end_of_write > cifsi->netfs.remote_i_size)

		netfs_resize_file(&cifsi->netfs, end_of_write, true);

}



static ssize_t
@@ -3247,8 +3247,8 @@ cifs_uncached_writev_complete(struct work_struct *work) 


	spin_lock(&inode->i_lock);

	cifs_update_eof(cifsi, wdata->offset, wdata->bytes);

	if (cifsi->server_eof > inode->i_size)

		i_size_write(inode, cifsi->server_eof);

	if (cifsi->netfs.remote_i_size > inode->i_size)

		i_size_write(inode, cifsi->netfs.remote_i_size);

	spin_unlock(&inode->i_lock);



	complete(&wdata->done);

fs/smb/client/inode.c

+5 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr) 
	fattr->cf_mtime = timestamp_truncate(fattr->cf_mtime, inode);

	mtime = inode_get_mtime(inode);

	if (timespec64_equal(&mtime, &fattr->cf_mtime) &&

	    cifs_i->server_eof == fattr->cf_eof) {

	    cifs_i->netfs.remote_i_size == fattr->cf_eof) {

		cifs_dbg(FYI, "%s: inode %llu is unchanged\n",

			 __func__, cifs_i->uniqueid);

		return;
@@ -194,7 +194,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr) 
	else

		clear_bit(CIFS_INO_DELETE_PENDING, &cifs_i->flags);



	cifs_i->server_eof = fattr->cf_eof;

	cifs_i->netfs.remote_i_size = fattr->cf_eof;

	/*

	 * Can't safely change the file size here if the client is writing to

	 * it due to potential races.
@@ -2858,7 +2858,7 @@ cifs_set_file_size(struct inode *inode, struct iattr *attrs, 


set_size_out:

	if (rc == 0) {

		cifsInode->server_eof = attrs->ia_size;

		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);

		cifs_setsize(inode, attrs->ia_size);

		/*

		 * i_blocks is not related to (i_size / i_blksize), but instead
@@ -3011,6 +3011,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) 
	if ((attrs->ia_valid & ATTR_SIZE) &&

	    attrs->ia_size != i_size_read(inode)) {

		truncate_setsize(inode, attrs->ia_size);

		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);

		fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);

	}
@@ -3210,6 +3211,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) 
	if ((attrs->ia_valid & ATTR_SIZE) &&

	    attrs->ia_size != i_size_read(inode)) {

		truncate_setsize(inode, attrs->ia_size);

		netfs_resize_file(&cifsInode->netfs, attrs->ia_size, true);

		fscache_resize_cookie(cifs_inode_cookie(inode), attrs->ia_size);

	}

fs/smb/client/readdir.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name, 
					if (likely(reparse_inode_match(inode, fattr))) {

						fattr->cf_mode = inode->i_mode;

						fattr->cf_rdev = inode->i_rdev;

						fattr->cf_eof = CIFS_I(inode)->server_eof;

						fattr->cf_eof = CIFS_I(inode)->netfs.remote_i_size;

						fattr->cf_symlink_target = NULL;

					} else {

						CIFS_I(inode)->time = 0;