* cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!)
@ 2013-10-06 19:08 Jan Klos
2013-10-07 0:03 ` Steve French
2013-10-07 11:55 ` Jeff Layton
0 siblings, 2 replies; 3+ messages in thread
From: Jan Klos @ 2013-10-06 19:08 UTC (permalink / raw)
To: Steve French; +Cc: linux-cifs, samba-technical, linux-kernel, trivial, Jan Klos
When connecting to SMB2/3 shares, maximum file size is set to non-LFS maximum in superblock. This is due to cap_large_files bit being different for SMB1 and SMB2/3 (where it is just an internal flag that is not negotiated and the SMB1 one corresponds to multichannel capability, so maybe LFS works correctly if server sends 0x08 flag) while capabilities are checked always for the SMB1 bit in cifs_read_super().
The patch fixes this by checking for the correct bit according to the protocol version.
Sorry for the TWO reposts, Gmail messed up the first mail, Thunderbird added spaces to the patch part in the second. I am really sorry! I think I fixed a quite significant bug, so have mercy on me...
Signed-off-by: Jan Klos <honza.klos@gmail.com>
---
diff -uprN a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
--- a/fs/cifs/cifsfs.c 2013-10-05 16:18:07.000000000 +0200
+++ b/fs/cifs/cifsfs.c 2013-10-06 16:18:13.488378000 +0200
@@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb)
{
struct inode *inode;
struct cifs_sb_info *cifs_sb;
+ struct cifs_tcon *tcon;
int rc = 0;
cifs_sb = CIFS_SB(sb);
+ tcon = cifs_sb_master_tcon(cifs_sb);
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL)
sb->s_flags |= MS_POSIXACL;
- if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES)
+ if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)
sb->s_maxbytes = MAX_LFS_FILESIZE;
else
sb->s_maxbytes = MAX_NON_LFS;
@@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb)
goto out_no_root;
}
- if (cifs_sb_master_tcon(cifs_sb)->nocase)
+ if (tcon->nocase)
sb->s_d_op = &cifs_ci_dentry_ops;
else
sb->s_d_op = &cifs_dentry_ops;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!)
2013-10-06 19:08 cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!) Jan Klos
@ 2013-10-07 0:03 ` Steve French
2013-10-07 11:55 ` Jeff Layton
1 sibling, 0 replies; 3+ messages in thread
From: Steve French @ 2013-10-07 0:03 UTC (permalink / raw)
To: Jan Klos
Cc: Steve French, linux-cifs@vger.kernel.org, samba-technical, LKML,
Jiri Kosina
Looks good.
Will plan to merge into cifs-2..6.git soon.
Probably should also go to stable kernels
On Sun, Oct 6, 2013 at 2:08 PM, Jan Klos <honza.klos@gmail.com> wrote:
> When connecting to SMB2/3 shares, maximum file size is set to non-LFS maximum in superblock. This is due to cap_large_files bit being different for SMB1 and SMB2/3 (where it is just an internal flag that is not negotiated and the SMB1 one corresponds to multichannel capability, so maybe LFS works correctly if server sends 0x08 flag) while capabilities are checked always for the SMB1 bit in cifs_read_super().
>
> The patch fixes this by checking for the correct bit according to the protocol version.
>
> Sorry for the TWO reposts, Gmail messed up the first mail, Thunderbird added spaces to the patch part in the second. I am really sorry! I think I fixed a quite significant bug, so have mercy on me...
>
>
> Signed-off-by: Jan Klos <honza.klos@gmail.com>
>
> ---
>
> diff -uprN a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> --- a/fs/cifs/cifsfs.c 2013-10-05 16:18:07.000000000 +0200
> +++ b/fs/cifs/cifsfs.c 2013-10-06 16:18:13.488378000 +0200
> @@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb)
> {
> struct inode *inode;
> struct cifs_sb_info *cifs_sb;
> + struct cifs_tcon *tcon;
> int rc = 0;
>
> cifs_sb = CIFS_SB(sb);
> + tcon = cifs_sb_master_tcon(cifs_sb);
>
> if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL)
> sb->s_flags |= MS_POSIXACL;
>
> - if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES)
> + if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)
> sb->s_maxbytes = MAX_LFS_FILESIZE;
> else
> sb->s_maxbytes = MAX_NON_LFS;
> @@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb)
> goto out_no_root;
> }
>
> - if (cifs_sb_master_tcon(cifs_sb)->nocase)
> + if (tcon->nocase)
> sb->s_d_op = &cifs_ci_dentry_ops;
> else
> sb->s_d_op = &cifs_dentry_ops;
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!)
2013-10-06 19:08 cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!) Jan Klos
2013-10-07 0:03 ` Steve French
@ 2013-10-07 11:55 ` Jeff Layton
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2013-10-07 11:55 UTC (permalink / raw)
To: Jan Klos; +Cc: Steve French, linux-cifs, samba-technical, linux-kernel, trivial
On Sun, 06 Oct 2013 21:08:20 +0200
Jan Klos <honza.klos@gmail.com> wrote:
> When connecting to SMB2/3 shares, maximum file size is set to non-LFS maximum in superblock. This is due to cap_large_files bit being different for SMB1 and SMB2/3 (where it is just an internal flag that is not negotiated and the SMB1 one corresponds to multichannel capability, so maybe LFS works correctly if server sends 0x08 flag) while capabilities are checked always for the SMB1 bit in cifs_read_super().
>
> The patch fixes this by checking for the correct bit according to the protocol version.
>
> Sorry for the TWO reposts, Gmail messed up the first mail, Thunderbird added spaces to the patch part in the second. I am really sorry! I think I fixed a quite significant bug, so have mercy on me...
>
>
> Signed-off-by: Jan Klos <honza.klos@gmail.com>
>
> ---
>
> diff -uprN a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> --- a/fs/cifs/cifsfs.c 2013-10-05 16:18:07.000000000 +0200
> +++ b/fs/cifs/cifsfs.c 2013-10-06 16:18:13.488378000 +0200
> @@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb)
> {
> struct inode *inode;
> struct cifs_sb_info *cifs_sb;
> + struct cifs_tcon *tcon;
> int rc = 0;
>
> cifs_sb = CIFS_SB(sb);
> + tcon = cifs_sb_master_tcon(cifs_sb);
>
> if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL)
> sb->s_flags |= MS_POSIXACL;
>
> - if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES)
> + if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)
> sb->s_maxbytes = MAX_LFS_FILESIZE;
> else
> sb->s_maxbytes = MAX_NON_LFS;
> @@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb)
> goto out_no_root;
> }
>
> - if (cifs_sb_master_tcon(cifs_sb)->nocase)
> + if (tcon->nocase)
> sb->s_d_op = &cifs_ci_dentry_ops;
> else
> sb->s_d_op = &cifs_dentry_ops;
Nice catch.
Reviewed-by: Jeff Layton <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-07 11:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-06 19:08 cifs: Fix inability to write files >2GB to SMB2/3 shares (THIS TIME I GOT IT RIGHT, PROMISE!) Jan Klos
2013-10-07 0:03 ` Steve French
2013-10-07 11:55 ` Jeff Layton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox