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 17:07:57 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
2014-04-23 18:00:36 +04:00
|
|
|
* Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright
|
|
|
|
* details
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/buffer_head.h>
|
2012-03-17 09:16:43 +04:00
|
|
|
#include "reiserfs.h"
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* access to tail : when one is going to read tail it must make sure, that is
|
|
|
|
* not running. direct2indirect and indirect2direct can not run concurrently
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* Converts direct items to an unformatted node. Panics if file has no
|
|
|
|
* tail. -ENOSPC if no disk space for conversion
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* path points to first direct item of the file regardless of how many of
|
|
|
|
* them are there
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
|
2006-12-08 13:36:32 +03:00
|
|
|
struct treepath *path, struct buffer_head *unbh,
|
2005-07-13 07:21:28 +04:00
|
|
|
loff_t tail_offset)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2005-07-13 07:21:28 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
struct buffer_head *up_to_date_bh;
|
2014-04-23 18:00:35 +04:00
|
|
|
struct item_head *p_le_ih = tp_item_head(path);
|
2005-07-13 07:21:28 +04:00
|
|
|
unsigned long total_tail = 0;
|
2014-04-23 18:00:36 +04:00
|
|
|
|
|
|
|
/* Key to search for the last byte of the converted item. */
|
|
|
|
struct cpu_key end_key;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* new indirect item to be inserted or key
|
|
|
|
* of unfm pointer to be pasted
|
|
|
|
*/
|
|
|
|
struct item_head ind_ih;
|
|
|
|
int blk_size;
|
|
|
|
/* returned value for reiserfs_insert_item and clones */
|
|
|
|
int retval;
|
|
|
|
/* Handle on an unformatted node that will be inserted in the tree. */
|
|
|
|
unp_t unfm_ptr;
|
2005-07-13 07:21:28 +04:00
|
|
|
|
|
|
|
BUG_ON(!th->t_trans_id);
|
|
|
|
|
|
|
|
REISERFS_SB(sb)->s_direct2indirect++;
|
|
|
|
|
2009-03-30 22:02:50 +04:00
|
|
|
blk_size = sb->s_blocksize;
|
2005-07-13 07:21:28 +04:00
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* and key to search for append or insert pointer to the new
|
|
|
|
* unformatted node.
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
copy_item_head(&ind_ih, p_le_ih);
|
|
|
|
set_le_ih_k_offset(&ind_ih, tail_offset);
|
|
|
|
set_le_ih_k_type(&ind_ih, TYPE_INDIRECT);
|
|
|
|
|
|
|
|
/* Set the key to search for the place for new unfm pointer */
|
|
|
|
make_cpu_key(&end_key, inode, tail_offset, TYPE_INDIRECT, 4);
|
|
|
|
|
2009-03-30 22:02:44 +04:00
|
|
|
/* FIXME: we could avoid this */
|
2005-07-13 07:21:28 +04:00
|
|
|
if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
|
2009-03-30 22:02:28 +04:00
|
|
|
reiserfs_error(sb, "PAP-14030",
|
|
|
|
"pasted or inserted byte exists in "
|
|
|
|
"the tree %K. Use fsck to repair.", &end_key);
|
2005-07-13 07:21:28 +04:00
|
|
|
pathrelse(path);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
2014-04-23 18:00:35 +04:00
|
|
|
p_le_ih = tp_item_head(path);
|
2005-07-13 07:21:28 +04:00
|
|
|
|
|
|
|
unfm_ptr = cpu_to_le32(unbh->b_blocknr);
|
|
|
|
|
|
|
|
if (is_statdata_le_ih(p_le_ih)) {
|
|
|
|
/* Insert new indirect item. */
|
|
|
|
set_ih_free_space(&ind_ih, 0); /* delete at nearest future */
|
|
|
|
put_ih_item_len(&ind_ih, UNFM_P_SIZE);
|
|
|
|
PATH_LAST_POSITION(path)++;
|
2009-03-30 22:02:50 +04:00
|
|
|
retval =
|
2005-07-13 07:21:28 +04:00
|
|
|
reiserfs_insert_item(th, path, &end_key, &ind_ih, inode,
|
2005-04-17 02:20:36 +04:00
|
|
|
(char *)&unfm_ptr);
|
|
|
|
} else {
|
2005-07-13 07:21:28 +04:00
|
|
|
/* Paste into last indirect item of an object. */
|
2009-03-30 22:02:50 +04:00
|
|
|
retval = reiserfs_paste_into_item(th, path, &end_key, inode,
|
2005-07-13 07:21:28 +04:00
|
|
|
(char *)&unfm_ptr,
|
|
|
|
UNFM_P_SIZE);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-03-30 22:02:50 +04:00
|
|
|
if (retval) {
|
|
|
|
return retval;
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* note: from here there are two keys which have matching first
|
|
|
|
* three key components. They only differ by the fourth one.
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
|
|
|
|
/* Set the key to search for the direct items of the file */
|
|
|
|
make_cpu_key(&end_key, inode, max_reiserfs_offset(inode), TYPE_DIRECT,
|
|
|
|
4);
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* Move bytes from the direct items to the new unformatted node
|
|
|
|
* and delete them.
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
while (1) {
|
|
|
|
int tail_size;
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* end_key.k_offset is set so, that we will always have found
|
|
|
|
* last item of the file
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
if (search_for_position_by_key(sb, &end_key, path) ==
|
|
|
|
POSITION_FOUND)
|
2009-03-30 22:02:25 +04:00
|
|
|
reiserfs_panic(sb, "PAP-14050",
|
2005-07-13 07:21:28 +04:00
|
|
|
"direct item (%K) not found", &end_key);
|
2014-04-23 18:00:35 +04:00
|
|
|
p_le_ih = tp_item_head(path);
|
2005-07-13 07:21:28 +04:00
|
|
|
RFALSE(!is_direct_le_ih(p_le_ih),
|
|
|
|
"vs-14055: direct item expected(%K), found %h",
|
|
|
|
&end_key, p_le_ih);
|
2009-03-30 22:02:50 +04:00
|
|
|
tail_size = (le_ih_k_offset(p_le_ih) & (blk_size - 1))
|
2005-07-13 07:21:28 +04:00
|
|
|
+ ih_item_len(p_le_ih) - 1;
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* we only send the unbh pointer if the buffer is not
|
|
|
|
* up to date. this avoids overwriting good data from
|
|
|
|
* writepage() with old data from the disk or buffer cache
|
|
|
|
* Special case: unbh->b_page will be NULL if we are coming
|
|
|
|
* through DIRECT_IO handler here.
|
2005-07-13 07:21:28 +04:00
|
|
|
*/
|
|
|
|
if (!unbh->b_page || buffer_uptodate(unbh)
|
|
|
|
|| PageUptodate(unbh->b_page)) {
|
|
|
|
up_to_date_bh = NULL;
|
|
|
|
} else {
|
|
|
|
up_to_date_bh = unbh;
|
|
|
|
}
|
2009-03-30 22:02:50 +04:00
|
|
|
retval = reiserfs_delete_item(th, path, &end_key, inode,
|
2005-07-13 07:21:28 +04:00
|
|
|
up_to_date_bh);
|
|
|
|
|
2009-03-30 22:02:50 +04:00
|
|
|
total_tail += retval;
|
2014-04-23 18:00:36 +04:00
|
|
|
|
|
|
|
/* done: file does not have direct items anymore */
|
2009-03-30 22:02:50 +04:00
|
|
|
if (tail_size == retval)
|
2005-07-13 07:21:28 +04:00
|
|
|
break;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* if we've copied bytes from disk into the page, we need to zero
|
|
|
|
* out the unused part of the block (it was not up to date before)
|
2005-07-13 07:21:28 +04:00
|
|
|
*/
|
|
|
|
if (up_to_date_bh) {
|
|
|
|
unsigned pgoff =
|
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 15:29:47 +03:00
|
|
|
(tail_offset + total_tail - 1) & (PAGE_SIZE - 1);
|
2011-11-25 19:14:35 +04:00
|
|
|
char *kaddr = kmap_atomic(up_to_date_bh->b_page);
|
2009-03-30 22:02:50 +04:00
|
|
|
memset(kaddr + pgoff, 0, blk_size - total_tail);
|
2011-11-25 19:14:35 +04:00
|
|
|
kunmap_atomic(kaddr);
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
REISERFS_I(inode)->i_first_direct_byte = U32_MAX;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* stolen from fs/buffer.c */
|
2005-07-13 07:21:28 +04:00
|
|
|
void reiserfs_unmap_buffer(struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
lock_buffer(bh);
|
|
|
|
if (buffer_journaled(bh) || buffer_journal_dirty(bh)) {
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
clear_buffer_dirty(bh);
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* Remove the buffer from whatever list it belongs to. We are mostly
|
|
|
|
* interested in removing it from per-sb j_dirty_buffers list, to avoid
|
|
|
|
* BUG() on attempt to write not mapped buffer
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
if ((!list_empty(&bh->b_assoc_buffers) || bh->b_private) && bh->b_page) {
|
|
|
|
struct inode *inode = bh->b_page->mapping->host;
|
|
|
|
struct reiserfs_journal *j = SB_JOURNAL(inode->i_sb);
|
|
|
|
spin_lock(&j->j_dirty_buffers_lock);
|
|
|
|
list_del_init(&bh->b_assoc_buffers);
|
|
|
|
reiserfs_free_jh(bh);
|
|
|
|
spin_unlock(&j->j_dirty_buffers_lock);
|
|
|
|
}
|
|
|
|
clear_buffer_mapped(bh);
|
|
|
|
clear_buffer_req(bh);
|
|
|
|
clear_buffer_new(bh);
|
|
|
|
bh->b_bdev = NULL;
|
|
|
|
unlock_buffer(bh);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* this first locks inode (neither reads nor sync are permitted),
|
|
|
|
* reads tail through page cache, insert direct item. When direct item
|
|
|
|
* inserted successfully inode is left locked. Return value is always
|
|
|
|
* what we expect from it (number of cut bytes). But when tail remains
|
|
|
|
* in the unformatted node, we set mode to SKIP_BALANCING and unlock
|
|
|
|
* inode
|
|
|
|
*/
|
2009-03-30 22:02:47 +04:00
|
|
|
int indirect2direct(struct reiserfs_transaction_handle *th,
|
|
|
|
struct inode *inode, struct page *page,
|
2009-03-30 22:02:49 +04:00
|
|
|
struct treepath *path, /* path to the indirect item. */
|
|
|
|
const struct cpu_key *item_key, /* Key to look for
|
|
|
|
* unformatted node
|
|
|
|
* pointer to be cut. */
|
2005-07-13 07:21:28 +04:00
|
|
|
loff_t n_new_file_size, /* New file size. */
|
2009-03-30 22:02:49 +04:00
|
|
|
char *mode)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2009-03-30 22:02:47 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
2005-07-13 07:21:28 +04:00
|
|
|
struct item_head s_ih;
|
2009-03-30 22:02:50 +04:00
|
|
|
unsigned long block_size = sb->s_blocksize;
|
2005-07-13 07:21:28 +04:00
|
|
|
char *tail;
|
|
|
|
int tail_len, round_tail_len;
|
|
|
|
loff_t pos, pos1; /* position of first byte of the tail */
|
|
|
|
struct cpu_key key;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
BUG_ON(!th->t_trans_id);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-03-30 22:02:45 +04:00
|
|
|
REISERFS_SB(sb)->s_indirect2direct++;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-03-30 22:02:49 +04:00
|
|
|
*mode = M_SKIP_BALANCING;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
/* store item head path points to. */
|
2014-04-23 18:00:35 +04:00
|
|
|
copy_item_head(&s_ih, tp_item_head(path));
|
2005-07-13 07:21:28 +04:00
|
|
|
|
2009-03-30 22:02:50 +04:00
|
|
|
tail_len = (n_new_file_size & (block_size - 1));
|
2009-03-30 22:02:47 +04:00
|
|
|
if (get_inode_sd_version(inode) == STAT_DATA_V2)
|
2005-07-13 07:21:28 +04:00
|
|
|
round_tail_len = ROUND_UP(tail_len);
|
|
|
|
else
|
|
|
|
round_tail_len = tail_len;
|
|
|
|
|
|
|
|
pos =
|
|
|
|
le_ih_k_offset(&s_ih) - 1 + (ih_item_len(&s_ih) / UNFM_P_SIZE -
|
2009-03-30 22:02:45 +04:00
|
|
|
1) * sb->s_blocksize;
|
2005-07-13 07:21:28 +04:00
|
|
|
pos1 = pos;
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* we are protected by i_mutex. The tail can not disapper, not
|
|
|
|
* append can be done either
|
|
|
|
* we are in truncate or packing tail in file_release
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
|
|
|
|
tail = (char *)kmap(page); /* this can schedule */
|
|
|
|
|
2009-03-30 22:02:49 +04:00
|
|
|
if (path_changed(&s_ih, path)) {
|
2005-07-13 07:21:28 +04:00
|
|
|
/* re-search indirect item */
|
2009-03-30 22:02:49 +04:00
|
|
|
if (search_for_position_by_key(sb, item_key, path)
|
2005-07-13 07:21:28 +04:00
|
|
|
== POSITION_NOT_FOUND)
|
2009-03-30 22:02:45 +04:00
|
|
|
reiserfs_panic(sb, "PAP-5520",
|
2005-07-13 07:21:28 +04:00
|
|
|
"item to be converted %K does not exist",
|
2009-03-30 22:02:49 +04:00
|
|
|
item_key);
|
2014-04-23 18:00:35 +04:00
|
|
|
copy_item_head(&s_ih, tp_item_head(path));
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_REISERFS_CHECK
|
2005-07-13 07:21:28 +04:00
|
|
|
pos = le_ih_k_offset(&s_ih) - 1 +
|
|
|
|
(ih_item_len(&s_ih) / UNFM_P_SIZE -
|
2009-03-30 22:02:45 +04:00
|
|
|
1) * sb->s_blocksize;
|
2005-07-13 07:21:28 +04:00
|
|
|
if (pos != pos1)
|
2009-03-30 22:02:45 +04:00
|
|
|
reiserfs_panic(sb, "vs-5530", "tail position "
|
2009-03-30 22:02:25 +04:00
|
|
|
"changed while we were reading it");
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
/* Set direct item header to insert. */
|
2009-03-30 22:02:47 +04:00
|
|
|
make_le_item_head(&s_ih, NULL, get_inode_item_key_version(inode),
|
2005-07-13 07:21:28 +04:00
|
|
|
pos1 + 1, TYPE_DIRECT, round_tail_len,
|
|
|
|
0xffff /*ih_free_space */ );
|
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* we want a pointer to the first byte of the tail in the page.
|
|
|
|
* the page was locked and this part of the page was up to date when
|
|
|
|
* indirect2direct was called, so we know the bytes are still valid
|
2005-07-13 07:21:28 +04:00
|
|
|
*/
|
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 15:29:47 +03:00
|
|
|
tail = tail + (pos & (PAGE_SIZE - 1));
|
2005-07-13 07:21:28 +04:00
|
|
|
|
2009-03-30 22:02:49 +04:00
|
|
|
PATH_LAST_POSITION(path)++;
|
2005-07-13 07:21:28 +04:00
|
|
|
|
2009-03-30 22:02:49 +04:00
|
|
|
key = *item_key;
|
2005-07-13 07:21:28 +04:00
|
|
|
set_cpu_key_k_type(&key, TYPE_DIRECT);
|
|
|
|
key.key_length = 4;
|
|
|
|
/* Insert tail as new direct item in the tree */
|
2009-03-30 22:02:49 +04:00
|
|
|
if (reiserfs_insert_item(th, path, &key, &s_ih, inode,
|
2005-07-13 07:21:28 +04:00
|
|
|
tail ? tail : NULL) < 0) {
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* No disk memory. So we can not convert last unformatted node
|
|
|
|
* to the direct item. In this case we used to adjust
|
|
|
|
* indirect items's ih_free_space. Now ih_free_space is not
|
|
|
|
* used, it would be ideal to write zeros to corresponding
|
|
|
|
* unformatted node. For now i_size is considered as guard for
|
|
|
|
* going out of file size
|
|
|
|
*/
|
2005-07-13 07:21:28 +04:00
|
|
|
kunmap(page);
|
2009-03-30 22:02:50 +04:00
|
|
|
return block_size - round_tail_len;
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|
|
|
|
kunmap(page);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
/* make sure to get the i_blocks changes from reiserfs_insert_item */
|
2009-03-30 22:02:47 +04:00
|
|
|
reiserfs_update_sd(th, inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* note: we have now the same as in above direct2indirect
|
|
|
|
* conversion: there are two keys which have matching first three
|
|
|
|
* key components. They only differ by the fourth one.
|
|
|
|
*/
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-04-23 18:00:36 +04:00
|
|
|
/*
|
|
|
|
* We have inserted new direct item and must remove last
|
|
|
|
* unformatted node.
|
|
|
|
*/
|
2009-03-30 22:02:49 +04:00
|
|
|
*mode = M_CUT;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-07-13 07:21:28 +04:00
|
|
|
/* we store position of first direct item in the in-core inode */
|
2009-03-30 22:02:47 +04:00
|
|
|
/* mark_file_with_tail (inode, pos1 + 1); */
|
|
|
|
REISERFS_I(inode)->i_first_direct_byte = pos1 + 1;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-03-30 22:02:50 +04:00
|
|
|
return block_size - round_tail_len;
|
2005-07-13 07:21:28 +04:00
|
|
|
}
|