License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
|
* linux/fs/minix/namei.c
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "minix.h"
|
|
|
|
|
|
|
|
|
|
static int add_nondir(struct dentry *dentry, struct inode *inode)
|
|
|
|
|
{
|
|
|
|
|
int err = minix_add_link(dentry, inode);
|
|
|
|
|
if (!err) {
|
|
|
|
|
d_instantiate(dentry, inode);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
iput(inode);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-11 04:13:09 +07:00
|
|
|
static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, unsigned int flags)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
struct inode * inode = NULL;
|
|
|
|
|
ino_t ino;
|
|
|
|
|
|
|
|
|
|
if (dentry->d_name.len > minix_sb(dir->i_sb)->s_namelen)
|
|
|
|
|
return ERR_PTR(-ENAMETOOLONG);
|
|
|
|
|
|
|
|
|
|
ino = minix_inode_by_name(dentry);
|
2018-05-01 06:57:34 +07:00
|
|
|
if (ino)
|
2008-02-07 15:15:44 +07:00
|
|
|
inode = minix_iget(dir->i_sb, ino);
|
2018-05-01 06:57:34 +07:00
|
|
|
return d_splice_alias(inode, dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
2011-07-26 12:52:52 +07:00
|
|
|
static int minix_mknod(struct inode * dir, struct dentry *dentry, umode_t mode, dev_t rdev)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
int error;
|
|
|
|
|
struct inode *inode;
|
|
|
|
|
|
|
|
|
|
if (!old_valid_dev(rdev))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
2010-03-04 21:32:14 +07:00
|
|
|
inode = minix_new_inode(dir, mode, &error);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
if (inode) {
|
|
|
|
|
minix_set_inode(inode, rdev);
|
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
|
error = add_nondir(dentry, inode);
|
|
|
|
|
}
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2013-06-07 12:20:27 +07:00
|
|
|
static int minix_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
|
|
|
|
|
{
|
|
|
|
|
int error;
|
|
|
|
|
struct inode *inode = minix_new_inode(dir, mode, &error);
|
|
|
|
|
if (inode) {
|
|
|
|
|
minix_set_inode(inode, 0);
|
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
|
d_tmpfile(dentry, inode);
|
|
|
|
|
}
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-26 12:42:34 +07:00
|
|
|
static int minix_create(struct inode *dir, struct dentry *dentry, umode_t mode,
|
2012-06-11 05:05:36 +07:00
|
|
|
bool excl)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
return minix_mknod(dir, dentry, mode, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int minix_symlink(struct inode * dir, struct dentry *dentry,
|
|
|
|
|
const char * symname)
|
|
|
|
|
{
|
|
|
|
|
int err = -ENAMETOOLONG;
|
|
|
|
|
int i = strlen(symname)+1;
|
|
|
|
|
struct inode * inode;
|
|
|
|
|
|
|
|
|
|
if (i > dir->i_sb->s_blocksize)
|
|
|
|
|
goto out;
|
|
|
|
|
|
2010-03-04 21:32:14 +07:00
|
|
|
inode = minix_new_inode(dir, S_IFLNK | 0777, &err);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!inode)
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
minix_set_inode(inode, 0);
|
|
|
|
|
err = page_symlink(inode, symname, i);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out_fail;
|
|
|
|
|
|
|
|
|
|
err = add_nondir(dentry, inode);
|
|
|
|
|
out:
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
out_fail:
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
iput(inode);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int minix_link(struct dentry * old_dentry, struct inode * dir,
|
|
|
|
|
struct dentry *dentry)
|
|
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(old_dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2016-09-14 21:48:05 +07:00
|
|
|
inode->i_ctime = current_time(inode);
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_inc_link_count(inode);
|
2010-10-23 22:11:40 +07:00
|
|
|
ihold(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
return add_nondir(dentry, inode);
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-26 12:41:39 +07:00
|
|
|
static int minix_mkdir(struct inode * dir, struct dentry *dentry, umode_t mode)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
|
struct inode * inode;
|
2012-02-07 00:45:27 +07:00
|
|
|
int err;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_inc_link_count(dir);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-09-10 06:38:19 +07:00
|
|
|
inode = minix_new_inode(dir, S_IFDIR | mode, &err);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!inode)
|
|
|
|
|
goto out_dir;
|
|
|
|
|
|
|
|
|
|
minix_set_inode(inode, 0);
|
|
|
|
|
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_inc_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
err = minix_make_empty(inode, dir);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out_fail;
|
|
|
|
|
|
|
|
|
|
err = minix_add_link(dentry, inode);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out_fail;
|
|
|
|
|
|
|
|
|
|
d_instantiate(dentry, inode);
|
|
|
|
|
out:
|
|
|
|
|
return err;
|
|
|
|
|
|
|
|
|
|
out_fail:
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(inode);
|
|
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
iput(inode);
|
|
|
|
|
out_dir:
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(dir);
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int minix_unlink(struct inode * dir, struct dentry *dentry)
|
|
|
|
|
{
|
|
|
|
|
int err = -ENOENT;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode * inode = d_inode(dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct page * page;
|
|
|
|
|
struct minix_dir_entry * de;
|
|
|
|
|
|
|
|
|
|
de = minix_find_entry(dentry, &page);
|
|
|
|
|
if (!de)
|
|
|
|
|
goto end_unlink;
|
|
|
|
|
|
|
|
|
|
err = minix_delete_entry(de, page);
|
|
|
|
|
if (err)
|
|
|
|
|
goto end_unlink;
|
|
|
|
|
|
|
|
|
|
inode->i_ctime = dir->i_ctime;
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
end_unlink:
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int minix_rmdir(struct inode * dir, struct dentry *dentry)
|
|
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode * inode = d_inode(dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
int err = -ENOTEMPTY;
|
|
|
|
|
|
|
|
|
|
if (minix_empty_dir(inode)) {
|
|
|
|
|
err = minix_unlink(dir, dentry);
|
|
|
|
|
if (!err) {
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(dir);
|
|
|
|
|
inode_dec_link_count(inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
|
fs: support RENAME_NOREPLACE for local filesystems
This is trivial to do:
- add flags argument to foo_rename()
- check if flags doesn't have any other than RENAME_NOREPLACE
- assign foo_rename() to .rename2 instead of .rename
Filesystems converted:
affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@kernel.org>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@infradead.org>
2016-09-27 16:03:57 +07:00
|
|
|
struct inode * new_dir, struct dentry *new_dentry,
|
|
|
|
|
unsigned int flags)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode * old_inode = d_inode(old_dentry);
|
|
|
|
|
struct inode * new_inode = d_inode(new_dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
struct page * dir_page = NULL;
|
|
|
|
|
struct minix_dir_entry * dir_de = NULL;
|
|
|
|
|
struct page * old_page;
|
|
|
|
|
struct minix_dir_entry * old_de;
|
|
|
|
|
int err = -ENOENT;
|
|
|
|
|
|
fs: support RENAME_NOREPLACE for local filesystems
This is trivial to do:
- add flags argument to foo_rename()
- check if flags doesn't have any other than RENAME_NOREPLACE
- assign foo_rename() to .rename2 instead of .rename
Filesystems converted:
affs, bfs, exofs, ext2, hfs, hfsplus, jffs2, jfs, logfs, minix, msdos,
nilfs2, omfs, reiserfs, sysvfs, ubifs, udf, ufs, vfat.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Boaz Harrosh <ooo@electrozaur.com>
Acked-by: Richard Weinberger <richard@nod.at>
Acked-by: Bob Copeland <me@bobcopeland.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dave Kleikamp <shaggy@kernel.org>
Cc: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: Christoph Hellwig <hch@infradead.org>
2016-09-27 16:03:57 +07:00
|
|
|
if (flags & ~RENAME_NOREPLACE)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
old_de = minix_find_entry(old_dentry, &old_page);
|
|
|
|
|
if (!old_de)
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
if (S_ISDIR(old_inode->i_mode)) {
|
|
|
|
|
err = -EIO;
|
|
|
|
|
dir_de = minix_dotdot(old_inode, &dir_page);
|
|
|
|
|
if (!dir_de)
|
|
|
|
|
goto out_old;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (new_inode) {
|
|
|
|
|
struct page * new_page;
|
|
|
|
|
struct minix_dir_entry * new_de;
|
|
|
|
|
|
|
|
|
|
err = -ENOTEMPTY;
|
|
|
|
|
if (dir_de && !minix_empty_dir(new_inode))
|
|
|
|
|
goto out_dir;
|
|
|
|
|
|
|
|
|
|
err = -ENOENT;
|
|
|
|
|
new_de = minix_find_entry(new_dentry, &new_page);
|
|
|
|
|
if (!new_de)
|
|
|
|
|
goto out_dir;
|
|
|
|
|
minix_set_link(new_de, new_page, old_inode);
|
2016-09-14 21:48:05 +07:00
|
|
|
new_inode->i_ctime = current_time(new_inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (dir_de)
|
2006-10-01 13:29:03 +07:00
|
|
|
drop_nlink(new_inode);
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(new_inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
} else {
|
|
|
|
|
err = minix_add_link(new_dentry, old_inode);
|
2011-03-02 21:41:38 +07:00
|
|
|
if (err)
|
2005-04-17 05:20:36 +07:00
|
|
|
goto out_dir;
|
|
|
|
|
if (dir_de)
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_inc_link_count(new_dir);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
minix_delete_entry(old_de, old_page);
|
2011-03-02 21:41:38 +07:00
|
|
|
mark_inode_dirty(old_inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
|
if (dir_de) {
|
|
|
|
|
minix_set_link(dir_de, dir_page, new_dir);
|
2006-03-23 18:00:51 +07:00
|
|
|
inode_dec_link_count(old_dir);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
out_dir:
|
|
|
|
|
if (dir_de) {
|
|
|
|
|
kunmap(dir_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(dir_page);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
out_old:
|
|
|
|
|
kunmap(old_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(old_page);
|
2005-04-17 05:20:36 +07:00
|
|
|
out:
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* directories can handle most operations...
|
|
|
|
|
*/
|
2007-02-12 15:55:39 +07:00
|
|
|
const struct inode_operations minix_dir_inode_operations = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.create = minix_create,
|
|
|
|
|
.lookup = minix_lookup,
|
|
|
|
|
.link = minix_link,
|
|
|
|
|
.unlink = minix_unlink,
|
|
|
|
|
.symlink = minix_symlink,
|
|
|
|
|
.mkdir = minix_mkdir,
|
|
|
|
|
.rmdir = minix_rmdir,
|
|
|
|
|
.mknod = minix_mknod,
|
|
|
|
|
.rename = minix_rename,
|
|
|
|
|
.getattr = minix_getattr,
|
2013-06-07 12:20:27 +07:00
|
|
|
.tmpfile = minix_tmpfile,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|