tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7cd3c412 82821be8

+6 -7
+1 -1
fs/cifs/connect.c
··· 3740 3740 3741 3741 if (!ses->binding) { 3742 3742 ses->capabilities = server->capabilities; 3743 - if (linuxExtEnabled == 0) 3743 + if (!linuxExtEnabled) 3744 3744 ses->capabilities &= (~server->vals->cap_unix); 3745 3745 3746 3746 if (ses->auth_key.response) {
+2 -1
fs/cifs/dfs_cache.c
··· 1260 1260 vi = find_vol(fullpath); 1261 1261 spin_unlock(&vol_list_lock); 1262 1262 1263 - kref_put(&vi->refcnt, vol_release); 1263 + if (!IS_ERR(vi)) 1264 + kref_put(&vi->refcnt, vol_release); 1264 1265 } 1265 1266 1266 1267 /**
+1 -3
fs/cifs/fs_context.c
··· 303 303 int 304 304 smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx) 305 305 { 306 - int rc = 0; 307 - 308 306 memcpy(new_ctx, ctx, sizeof(*ctx)); 309 307 new_ctx->prepath = NULL; 310 308 new_ctx->mount_options = NULL; ··· 325 327 DUP_CTX_STR(nodename); 326 328 DUP_CTX_STR(iocharset); 327 329 328 - return rc; 330 + return 0; 329 331 } 330 332 331 333 static int
+1 -1
fs/cifs/smb2pdu.c
··· 3248 3248 free_rsp_buf(resp_buftype, rsp); 3249 3249 3250 3250 /* retry close in a worker thread if this one is interrupted */ 3251 - if (rc == -EINTR) { 3251 + if (is_interrupt_error(rc)) { 3252 3252 int tmp_rc; 3253 3253 3254 3254 tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
+1 -1
fs/cifs/smb2pdu.h
··· 424 424 __le16 TransformCount; 425 425 __u16 Reserved1; 426 426 __u32 Reserved2; 427 - __le16 RDMATransformIds[1]; 427 + __le16 RDMATransformIds[]; 428 428 } __packed; 429 429 430 430 /* Signing algorithms */