Commit fdf50784 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.15-rc1-smb3' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs client fixes from Steve French:

 - two deferred close fixes (for bugs found with xfstests 478 and 461)

 - a deferred close improvement in rename

 - two trivial fixes for incorrect Linux comment formatting of multiple
   cifs files (pointed out by automated kernel test robot and
   checkpatch)

* tag '5.15-rc1-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Not to defer close on file when lock is set
  cifs: Fix soft lockup during fsstress
  cifs: Deferred close performance improvements
  cifs: fix incorrect kernel doc comments
  cifs: remove pathname for file from SPDX header
parents 4c17ca27 35866f3f

fs/cifs/cache.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

/*

 *   fs/cifs/cache.c - CIFS filesystem cache index structure definitions

 *   CIFS filesystem cache index structure definitions

 *

 *   Copyright (c) 2010 Novell, Inc.

 *   Authors(s): Suresh Jayaraman (sjayaraman@suse.de>

fs/cifs/cifs_debug.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 *   fs/cifs_debug.c

 *

 *   Copyright (C) International Business Machines  Corp., 2000,2005

 *

fs/cifs/cifs_fs_sb.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 */

/*

 *   fs/cifs/cifs_fs_sb.h

 *

 *   Copyright (c) International Business Machines  Corp., 2002,2004

 *   Author(s): Steve French (sfrench@us.ibm.com)

fs/cifs/cifs_ioctl.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 */

/*

 *   fs/cifs/cifs_ioctl.h

 *

 *   Structure definitions for io control for cifs/smb3

 *

fs/cifs/cifs_spnego.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

/*

 *   fs/cifs/cifs_spnego.c -- SPNEGO upcall management for CIFS

 *   SPNEGO upcall management for CIFS

 *

 *   Copyright (c) 2007 Red Hat, Inc.

 *   Author(s): Jeff Layton (jlayton@redhat.com)