Skip to content

Commit dc5a194

Browse files
committed
Merge branch 'aufs5.0/00base' into aufs5.1/00base
2 parents 2aae044 + e5e64fe commit dc5a194

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+84
-84
lines changed

Documentation/filesystems/aufs/design/01intro.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Introduction
55
----------------------------------------

Documentation/filesystems/aufs/design/02struct.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Basic Aufs Internal Structure
55

Documentation/filesystems/aufs/design/03atomic_open.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2015-2019 Junjiro R. Okajima
2+
# Copyright (C) 2015-2020 Junjiro R. Okajima
33

44
Support for a branch who has its ->atomic_open()
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/03lookup.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Lookup in a Branch
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/04branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Branch Manipulation
55

Documentation/filesystems/aufs/design/05wbr_policy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Policies to Select One among Multiple Writable Branches
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/06dirren.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2017-2019 Junjiro R. Okajima
2+
# Copyright (C) 2017-2020 Junjiro R. Okajima
33

44
Special handling for renaming a directory (DIRREN)
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/06fhsm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2011-2019 Junjiro R. Okajima
2+
# Copyright (C) 2011-2020 Junjiro R. Okajima
33

44
File-based Hierarchical Storage Management (FHSM)
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/06mmap.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
mmap(2) -- File Memory Mapping
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/06xattr.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2014-2019 Junjiro R. Okajima
2+
# Copyright (C) 2014-2020 Junjiro R. Okajima
33

44
Listing XATTR/EA and getting the value
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/07export.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Export Aufs via NFS
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/08shwh.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2005-2019 Junjiro R. Okajima
2+
# Copyright (C) 2005-2020 Junjiro R. Okajima
33

44
Show Whiteout Mode (shwh)
55
----------------------------------------------------------------------

Documentation/filesystems/aufs/design/10dynop.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Copyright (C) 2010-2019 Junjiro R. Okajima
2+
# Copyright (C) 2010-2020 Junjiro R. Okajima
33

44
Dynamically customizable FS operations
55
----------------------------------------------------------------------

fs/aufs/aufs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/branch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/branch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/cpup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/cpup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dbgaufs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dbgaufs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dcsub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dcsub.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dentry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dentry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dir.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dirren.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2017-2019 Junjiro R. Okajima
3+
* Copyright (C) 2017-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dirren.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2017-2019 Junjiro R. Okajima
3+
* Copyright (C) 2017-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dynop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2010-2019 Junjiro R. Okajima
3+
* Copyright (C) 2010-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/dynop.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2010-2019 Junjiro R. Okajima
3+
* Copyright (C) 2010-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/f_op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/fhsm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2011-2019 Junjiro R. Okajima
3+
* Copyright (C) 2011-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/file.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/finfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/fstype.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/hbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2017-2019 Junjiro R. Okajima
3+
* Copyright (C) 2017-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/hfsnotify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/hfsplus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2010-2019 Junjiro R. Okajima
3+
* Copyright (C) 2010-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/hnotify.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/i_op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/i_op_add.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/i_op_del.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/i_op_ren.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/iinfo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

fs/aufs/inode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* Copyright (C) 2005-2019 Junjiro R. Okajima
3+
* Copyright (C) 2005-2020 Junjiro R. Okajima
44
*/
55

66
/*

0 commit comments

Comments
 (0)