fix for rsize/wsize regression in one of the for-next patches
Subsystems (2)
Steve,
here is an updated patch for the [brw]size patch in for-next
PATCH 1/1 cifs: move [brw]size from cifs_sb to cifs_sb->ctx
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/cifs_fs_sb.h | 3 --- fs/cifs/cifsfs.c | 11 +++++++---- fs/cifs/connect.c | 23 +++++++++++------------ fs/cifs/file.c | 12 ++++++------ fs/cifs/fs_context.c | 3 +++ fs/cifs/fs_context.h | 3 +++ fs/cifs/inode.c | 2 +- fs/cifs/smb1ops.c | 2 +- fs/cifs/smb2ops.c | 2 +- 9 files changed, 33 insertions(+), 28 deletions(-)
fs/cifs/cifs_fs_sb.h +0 -3
@@ -62,9 +62,6 @@ struct cifs_sb_info {struct tcon_link *master_tlink;struct nls_table *local_nls;struct smb3_fs_context *ctx; -unsigned int bsize; -unsigned int rsize; -unsigned int wsize;atomic_t active;unsigned int mnt_cifs_flags;struct delayed_work prune_tlinks;
fs/cifs/cifsfs.c +7 -4
@@ -218,7 +218,7 @@ cifs_read_super(struct super_block *sb)if (rc) goto out_no_root;/* tune readahead according to rsize */ - sb->s_bdi->ra_pages = cifs_sb->rsize /PAGE_SIZE ; + sb->s_bdi->ra_pages = cifs_sb->ctx->rsize /PAGE_SIZE ; sb->s_blocksize =CIFS_MAX_MSGSIZE ; sb->s_blocksize_bits =14 ;/* default 2**14 = CIFS_MAX_MSGSIZE */
@@ -615,9 +615,12 @@ cifs_show_options(struct seq_file *s, struct dentry *root)from_kgid_munged (&init_user_ns, cifs_sb->ctx->backupgid)); -seq_printf (s,",rsize=%u" , cifs_sb->rsize); -seq_printf (s,",wsize=%u" , cifs_sb->wsize); -seq_printf (s,",bsize=%u" , cifs_sb->bsize); +if (cifs_sb->ctx->got_rsize) +seq_printf (s,",rsize=%u" , cifs_sb->ctx->rsize); +if (cifs_sb->ctx->got_wsize) +seq_printf (s,",wsize=%u" , cifs_sb->ctx->wsize); +if (cifs_sb->ctx->got_bsize) +seq_printf (s,",bsize=%u" , cifs_sb->ctx->bsize);if (tcon->ses->server->min_offload)seq_printf (s,",esize=%u" , tcon->ses->server->min_offload); seq_printf(s, ",echo_interval=%lu",
fs/cifs/connect.c +11 -12
@@ -2234,10 +2234,10 @@ compare_mount_options(struct super_block *sb, struct cifs_mnt_data *mnt_data)* We want to share sb only if we don't specify an r/wsize or * specified r/wsize is greater than or equal to existing one. */ -if (new->wsize && new->wsize < old->wsize) +if (new->ctx->wsize && new->ctx->wsize < old->ctx->wsize)return 0 ; -if (new->rsize && new->rsize < old->rsize) +if (new->ctx->rsize && new->ctx->rsize < old->ctx->rsize)return 0 ; if (!uid_eq(old->ctx->linux_uid, new->ctx->linux_uid) ||
@@ -2700,14 +2700,6 @@ int cifs_setup_cifs_sb(struct smb3_fs_context *ctx,spin_lock_init (&cifs_sb->tlink_tree_lock); cifs_sb->tlink_tree =RB_ROOT ; - cifs_sb->bsize = ctx->bsize; -/* -* Temporarily set r/wsize for matching superblock. If we end up using -* new sb then client will later negotiate it downward if needed. -*/ - cifs_sb->rsize = ctx->rsize; - cifs_sb->wsize = ctx->wsize; -cifs_dbg (FYI ,"file mode: %04ho dir mode: %04ho\n" , cifs_sb->ctx->file_mode, cifs_sb->ctx->dir_mode);
@@ -2911,8 +2903,15 @@ static int mount_get_conns(struct smb3_fs_context *ctx, struct cifs_sb_info *cif } } - cifs_sb->wsize = server->ops->negotiate_wsize (tcon, ctx); - cifs_sb->rsize = server->ops->negotiate_rsize (tcon, ctx); +/* +* Clamp the rsize/wsize mount arguments if they are too big for the server +*/ +if (cifs_sb->ctx->wsize ==0 || + cifs_sb->ctx->wsize > server->ops->negotiate_wsize (tcon, ctx)) + cifs_sb->ctx->wsize = server->ops->negotiate_wsize (tcon, ctx); +if (cifs_sb->ctx->rsize =0 || + cifs_sb->ctx->rsize > server->ops->negotiate_rsize (tcon, ctx)) + cifs_sb->ctx->rsize = server->ops->negotiate_rsize (tcon, ctx);return 0 ; }
fs/cifs/file.c +6 -6
@@ -2336,7 +2336,7 @@ static int cifs_writepages(struct address_space *mapping,* If wsize is smaller than the page cache size, default to writing * one page at a time via cifs_writepage */ -if (cifs_sb->wsize <PAGE_SIZE ) +if (cifs_sb->ctx->wsize <PAGE_SIZE )return generic_writepages (mapping, wbc); xid =get_xid ();
@@ -2369,7 +2369,7 @@ static int cifs_writepages(struct address_space *mapping,if (rc) get_file_rc = rc; - rc = server->ops->wait_mtu_credits (server, cifs_sb->wsize, + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->wsize, &wsize, credits);if (rc !=0 ) { done = true;
@@ -2911,7 +2911,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from,break ; } - rc = server->ops->wait_mtu_credits (server, cifs_sb->wsize, + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->wsize, &wsize, credits);if (rc)break ;
@@ -3642,7 +3642,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file,break ; } - rc = server->ops->wait_mtu_credits (server, cifs_sb->rsize, + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->rsize, &rsize, credits);if (rc)break ;
@@ -4028,7 +4028,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset) cifs_sb =CIFS_FILE_SB (file);/* FIXME: set up handlers for larger reads and/or convert to async */ - rsize = min_t(unsigned int, cifs_sb->rsize, CIFSMaxBufSize); + rsize = min_t(unsigned int, cifs_sb->ctx->rsize, CIFSMaxBufSize);if (file->private_data ==NULL ) { rc = -EBADF ;
@@ -4413,7 +4413,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping,break ; } - rc = server->ops->wait_mtu_credits (server, cifs_sb->rsize, + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->rsize, &rsize, credits);if (rc)break ;
fs/cifs/fs_context.c +3 -0
@@ -783,12 +783,15 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, goto cifs_parse_mount_err; } ctx->bsize = result.uint_32; + ctx->got_bsize = true;break ;case Opt_rsize: ctx->rsize = result.uint_32; + ctx->got_rsize = true;break ;case Opt_wsize: ctx->wsize = result.uint_32; + ctx->got_wsize = true;break ;case Opt_actimeo: ctx->actimeo =HZ * result.uint_32;
fs/cifs/fs_context.h +3 -0
@@ -152,6 +152,9 @@ struct smb3_fs_context {char *nodename;bool got_ip;bool got_version; +bool got_rsize; +bool got_wsize; +bool got_bsize;unsigned short port;char *username;
fs/cifs/inode.c +1 -1
@@ -2409,7 +2409,7 @@ int cifs_getattr(const struct path *path, struct kstat *stat, }generic_fillattr (inode, stat); - stat->blksize = cifs_sb->bsize; + stat->blksize = cifs_sb->ctx->bsize; stat->ino =CIFS_I (inode)->uniqueid;/* old CIFS Unix Extensions doesn't return create time */
fs/cifs/smb1ops.c +1 -1
@@ -1006,7 +1006,7 @@ cifs_is_read_op(__u32 oplock)static unsigned int cifs_wp_retry_size (struct inode *inode) { -return CIFS_SB (inode->i_sb)->wsize; +return CIFS_SB (inode->i_sb)->ctx->wsize; } static bool
fs/cifs/smb2ops.c +1 -1
@@ -3951,7 +3951,7 @@ smb3_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key)static unsigned int smb2_wp_retry_size (struct inode *inode) { - return min_t(unsigned int, CIFS_SB(inode->i_sb)->wsize, + return min_t(unsigned int, CIFS_SB(inode->i_sb)->ctx->wsize,SMB2_MAX_BUFFER_SIZE ); }
Signature · 1 line
2.13.6