Use cifsi->netfs_ctx.remote_i_size instead of cifsi->server_eof so that
netfslib can refer to it to.
Signed-off-by: David Howells <dhowe...@redhat.com>
cc: Steve French <sfre...@samba.org>
cc: Shyam Prasad N <nspmangal...@gmail.com>
cc: Rohith Surabattula <rohiths.m...@gmail.com>
cc: linux-c...@vger.kernel.org
---
fs/cifs/cifsfs.c | 2 +-
fs/cifs/cifsglob.h | 1 -
fs/cifs/file.c | 8 ++++----
fs/cifs/inode.c | 6 +++---
fs/cifs/smb2ops.c | 10 ++++------
5 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b33f5eb3233c..d07cb28652f2 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -376,7 +376,7 @@ cifs_alloc_inode(struct super_block *sb)
spin_lock_init(&cifs_inode->writers_lock);
cifs_inode->writers = 0;
cifs_inode->vfs_inode.i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */
- cifs_inode->server_eof = 0;
+ cifs_inode->netfs_ctx.remote_i_size = 0;
cifs_inode->uniqueid = 0;
cifs_inode->createtime = 0;
cifs_inode->epoch = 0;
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index e7db00396391..49eb86ebbdfb 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1416,7 +1416,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 */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 200280be064d..fcf92c25bc8f 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1913,8 +1913,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_ctx.remote_i_size)
+ cifsi->netfs_ctx.remote_i_size = end_of_write;
}
static ssize_t
@@ -2862,8 +2862,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_ctx.remote_i_size > inode->i_size)
+ i_size_write(inode, cifsi->netfs_ctx.remote_i_size);
spin_unlock(&inode->i_lock);
complete(&wdata->done);
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 40c6f04f7521..9ebb806c63d5 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -117,7 +117,7 @@ cifs_revalidate_cache(struct inode *inode, struct
cifs_fattr *fattr)
/* revalidate if mtime or size have changed */
fattr->cf_mtime = timestamp_truncate(fattr->cf_mtime, inode);
if (timespec64_equal(&inode->i_mtime, &fattr->cf_mtime) &&
- cifs_i->server_eof == fattr->cf_eof) {
+ cifs_i->netfs_ctx.remote_i_size == fattr->cf_eof) {
cifs_dbg(FYI, "%s: inode %llu is unchanged\n",
__func__, cifs_i->uniqueid);
return;
@@ -206,7 +206,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_ctx.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.
@@ -2642,7 +2642,7 @@ cifs_set_file_size(struct inode *inode, struct iattr
*attrs,
set_size_out:
if (rc == 0) {
- cifsInode->server_eof = attrs->ia_size;
+ cifsInode->netfs_ctx.remote_i_size = attrs->ia_size;
cifs_setsize(inode, attrs->ia_size);
/*
* i_blocks is not related to (i_size / i_blksize), but instead
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index b0485706e07c..2caac8696100 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -3833,7 +3833,7 @@ static long smb3_simple_falloc(struct file *file, struct
cifs_tcon *tcon,
rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
cfile->fid.volatile_fid, cfile->pid, &eof);
if (rc == 0) {
- cifsi->server_eof = off + len;
+ cifsi->netfs_ctx.remote_i_size = off + len;
cifs_setsize(inode, off + len);
cifs_truncate_page(inode->i_mapping, inode->i_size);
truncate_setsize(inode, off + len);
@@ -3926,13 +3926,11 @@ static long smb3_collapse_range(struct file *file,
struct cifs_tcon *tcon,
unsigned int xid;
struct inode *inode;
struct cifsFileInfo *cfile = file->private_data;
- struct cifsInodeInfo *cifsi;
__le64 eof;
xid = get_xid();
inode = d_inode(cfile->dentry);
- cifsi = CIFS_I(inode);
if (off >= i_size_read(inode) ||
off + len >= i_size_read(inode)) {
@@ -3953,9 +3951,9 @@ static long smb3_collapse_range(struct file *file, struct
cifs_tcon *tcon,
rc = 0;
- cifsi->server_eof = i_size_read(inode) - len;
- truncate_setsize(inode, cifsi->server_eof);
- fscache_resize_cookie(cifs_inode_cookie(inode), cifsi->server_eof);
+ netfs_resize_file(inode, eof);
+ truncate_setsize(inode, eof);
+ fscache_resize_cookie(cifs_inode_cookie(inode), eof);
out:
free_xid(xid);
return rc;
--
Linux-cachefs mailing list
Linux-cachefs@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-cachefs
