mirror of https://gitee.com/openkylin/linux.git
2 small cifs fixes for stable (including an important handle leak fix) and 3 small cleanup patches
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAmABLeEACgkQiiy9cAdy T1G5VAv/ZqpBJp6A/SOFGKlSBVTUqf++AWo/DsTZQLx938j6URChazImFb3eJ3FU WvqeUW9kza1OICVg0Wf3II2RCMDwJBqxfSCsj5qK53g9By4X1tsiatQZd9rWfBSc AW8nw5hzjrZ2e3//4gieSXZOHfT6n80hteAlIBNWvjN7w6R1DvZ7cIMkS6+M4EEn RBfcQlUTAihxFC8/RUqXMK8+jIXvt3hiRdI4gYV5GuAD8C7CvLKZJc0n6WZ0hPR5 IPlrY5j2J8yB+R+FkJ1Qjpzz7KrNCpkOyB0DPoHHlqRAT46oM8yfGGf2wlVr6v3A dG0DPQ5JAqB3vK9/3frJencXYRDCgLc4ZVwdFGrvv/wNZd29KBKiigfWIrxjnM13 tcN9Noy5mX791YvdYKpvijTSJqWslB04gLy2HuEkOAyOKo2sqiEtemB4bRPeJr1E cmheItvkOhNY13KZKyrTgnUy61H9eLpjhS+CJZl3dArhaPNtI+4OGuAv+BIQQNNf FbNvJWmQ =7ueC -----END PGP SIGNATURE----- Merge tag '5.11-rc3-smb3' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs fixes from Steve French: "Two small cifs fixes for stable (including an important handle leak fix) and three small cleanup patches" * tag '5.11-rc3-smb3' of git://git.samba.org/sfrench/cifs-2.6: cifs: style: replace one-element array with flexible-array cifs: connect: style: Simplify bool comparison fs: cifs: remove unneeded variable in smb3_fs_context_dup cifs: fix interrupted close commands cifs: check pointer before freeing
This commit is contained in:
commit
7cd3c41261
|
@ -3740,7 +3740,7 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses,
|
|||
|
||||
if (!ses->binding) {
|
||||
ses->capabilities = server->capabilities;
|
||||
if (linuxExtEnabled == 0)
|
||||
if (!linuxExtEnabled)
|
||||
ses->capabilities &= (~server->vals->cap_unix);
|
||||
|
||||
if (ses->auth_key.response) {
|
||||
|
|
|
@ -1260,7 +1260,8 @@ void dfs_cache_del_vol(const char *fullpath)
|
|||
vi = find_vol(fullpath);
|
||||
spin_unlock(&vol_list_lock);
|
||||
|
||||
kref_put(&vi->refcnt, vol_release);
|
||||
if (!IS_ERR(vi))
|
||||
kref_put(&vi->refcnt, vol_release);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -303,8 +303,6 @@ do { \
|
|||
int
|
||||
smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
memcpy(new_ctx, ctx, sizeof(*ctx));
|
||||
new_ctx->prepath = NULL;
|
||||
new_ctx->mount_options = NULL;
|
||||
|
@ -327,7 +325,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx
|
|||
DUP_CTX_STR(nodename);
|
||||
DUP_CTX_STR(iocharset);
|
||||
|
||||
return rc;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -3248,7 +3248,7 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
|
|||
free_rsp_buf(resp_buftype, rsp);
|
||||
|
||||
/* retry close in a worker thread if this one is interrupted */
|
||||
if (rc == -EINTR) {
|
||||
if (is_interrupt_error(rc)) {
|
||||
int tmp_rc;
|
||||
|
||||
tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
|
||||
|
|
|
@ -424,7 +424,7 @@ struct smb2_rdma_transform_capabilities_context {
|
|||
__le16 TransformCount;
|
||||
__u16 Reserved1;
|
||||
__u32 Reserved2;
|
||||
__le16 RDMATransformIds[1];
|
||||
__le16 RDMATransformIds[];
|
||||
} __packed;
|
||||
|
||||
/* Signing algorithms */
|
||||
|
|
Loading…
Reference in New Issue