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 15:07:57 +01:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
|
* linux/fs/hpfs/ea.c
|
|
|
|
|
*
|
|
|
|
|
* Mikulas Patocka (mikulas@artax.karlin.mff.cuni.cz), 1998-1999
|
|
|
|
|
*
|
|
|
|
|
* handling extended attributes
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "hpfs_fn.h"
|
|
|
|
|
|
|
|
|
|
/* Remove external extended attributes. ano specifies whether a is a
|
|
|
|
|
direct sector where eas starts or an anode */
|
|
|
|
|
|
|
|
|
|
void hpfs_ea_ext_remove(struct super_block *s, secno a, int ano, unsigned len)
|
|
|
|
|
{
|
|
|
|
|
unsigned pos = 0;
|
|
|
|
|
while (pos < len) {
|
|
|
|
|
char ex[4 + 255 + 1 + 8];
|
|
|
|
|
struct extended_attribute *ea = (struct extended_attribute *)ex;
|
|
|
|
|
if (pos + 4 > len) {
|
|
|
|
|
hpfs_error(s, "EAs don't end correctly, %s %08x, len %08x",
|
|
|
|
|
ano ? "anode" : "sectors", a, len);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return;
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea)) {
|
2011-05-08 20:44:32 +02:00
|
|
|
if (ea_valuelen(ea) != 8) {
|
2012-04-06 19:21:09 +02:00
|
|
|
hpfs_error(s, "ea_indirect(ea) set while ea->valuelen!=8, %s %08x, pos %08x",
|
2005-04-17 00:20:36 +02:00
|
|
|
ano ? "anode" : "sectors", a, pos);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4, ea->namelen + 9, ex+4))
|
|
|
|
|
return;
|
2012-04-06 19:21:09 +02:00
|
|
|
hpfs_ea_remove(s, ea_sec(ea), ea_in_anode(ea), ea_len(ea));
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
pos += ea->namelen + ea_valuelen(ea) + 5;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
if (!ano) hpfs_free_sectors(s, a, (len+511) >> 9);
|
|
|
|
|
else {
|
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
struct anode *anode;
|
|
|
|
|
if ((anode = hpfs_map_anode(s, a, &bh))) {
|
|
|
|
|
hpfs_remove_btree(s, &anode->btree);
|
|
|
|
|
brelse(bh);
|
|
|
|
|
hpfs_free_sectors(s, a, 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *get_indirect_ea(struct super_block *s, int ano, secno a, int size)
|
|
|
|
|
{
|
|
|
|
|
char *ret;
|
|
|
|
|
if (!(ret = kmalloc(size + 1, GFP_NOFS))) {
|
2014-06-06 23:36:36 +02:00
|
|
|
pr_err("out of memory for EA\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, 0, size, ret)) {
|
|
|
|
|
kfree(ret);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
ret[size] = 0;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-31 23:09:29 +01:00
|
|
|
static void set_indirect_ea(struct super_block *s, int ano, secno a,
|
|
|
|
|
const char *data, int size)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
|
hpfs_ea_write(s, a, ano, 0, size, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read an extended attribute named 'key' into the provided buffer */
|
|
|
|
|
|
|
|
|
|
int hpfs_read_ea(struct super_block *s, struct fnode *fnode, char *key,
|
|
|
|
|
char *buf, int size)
|
|
|
|
|
{
|
|
|
|
|
unsigned pos;
|
|
|
|
|
int ano, len;
|
|
|
|
|
secno a;
|
2011-05-08 20:44:38 +02:00
|
|
|
char ex[4 + 255 + 1 + 8];
|
2005-04-17 00:20:36 +02:00
|
|
|
struct extended_attribute *ea;
|
|
|
|
|
struct extended_attribute *ea_end = fnode_end_ea(fnode);
|
|
|
|
|
for (ea = fnode_ea(fnode); ea < ea_end; ea = next_ea(ea))
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto indirect;
|
2011-05-08 20:44:32 +02:00
|
|
|
if (ea_valuelen(ea) >= size)
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EINVAL;
|
2011-05-08 20:44:32 +02:00
|
|
|
memcpy(buf, ea_data(ea), ea_valuelen(ea));
|
|
|
|
|
buf[ea_valuelen(ea)] = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
a = le32_to_cpu(fnode->ea_secno);
|
|
|
|
|
len = le32_to_cpu(fnode->ea_size_l);
|
2012-04-06 20:30:07 +02:00
|
|
|
ano = fnode_in_anode(fnode);
|
2005-04-17 00:20:36 +02:00
|
|
|
pos = 0;
|
|
|
|
|
while (pos < len) {
|
|
|
|
|
ea = (struct extended_attribute *)ex;
|
|
|
|
|
if (pos + 4 > len) {
|
|
|
|
|
hpfs_error(s, "EAs don't end correctly, %s %08x, len %08x",
|
|
|
|
|
ano ? "anode" : "sectors", a, len);
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return -EIO;
|
2012-04-06 19:21:09 +02:00
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4, ea->namelen + 1 + (ea_indirect(ea) ? 8 : 0), ex + 4))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EIO;
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto indirect;
|
2011-05-08 20:44:32 +02:00
|
|
|
if (ea_valuelen(ea) >= size)
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EINVAL;
|
2011-05-08 20:44:32 +02:00
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), buf))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EIO;
|
2011-05-08 20:44:32 +02:00
|
|
|
buf[ea_valuelen(ea)] = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
pos += ea->namelen + ea_valuelen(ea) + 5;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
return -ENOENT;
|
|
|
|
|
indirect:
|
|
|
|
|
if (ea_len(ea) >= size)
|
|
|
|
|
return -EINVAL;
|
2012-04-06 19:21:09 +02:00
|
|
|
if (hpfs_ea_read(s, ea_sec(ea), ea_in_anode(ea), 0, ea_len(ea), buf))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EIO;
|
|
|
|
|
buf[ea_len(ea)] = 0;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read an extended attribute named 'key' */
|
|
|
|
|
char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *size)
|
|
|
|
|
{
|
|
|
|
|
char *ret;
|
|
|
|
|
unsigned pos;
|
|
|
|
|
int ano, len;
|
|
|
|
|
secno a;
|
|
|
|
|
struct extended_attribute *ea;
|
|
|
|
|
struct extended_attribute *ea_end = fnode_end_ea(fnode);
|
|
|
|
|
for (ea = fnode_ea(fnode); ea < ea_end; ea = next_ea(ea))
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea))
|
|
|
|
|
return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(ea));
|
2011-05-08 20:44:32 +02:00
|
|
|
if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
|
2014-06-06 23:36:36 +02:00
|
|
|
pr_err("out of memory for EA\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
return NULL;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
memcpy(ret, ea_data(ea), ea_valuelen(ea));
|
|
|
|
|
ret[ea_valuelen(ea)] = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
return ret;
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
a = le32_to_cpu(fnode->ea_secno);
|
|
|
|
|
len = le32_to_cpu(fnode->ea_size_l);
|
2012-04-06 20:30:07 +02:00
|
|
|
ano = fnode_in_anode(fnode);
|
2005-04-17 00:20:36 +02:00
|
|
|
pos = 0;
|
|
|
|
|
while (pos < len) {
|
|
|
|
|
char ex[4 + 255 + 1 + 8];
|
|
|
|
|
ea = (struct extended_attribute *)ex;
|
|
|
|
|
if (pos + 4 > len) {
|
|
|
|
|
hpfs_error(s, "EAs don't end correctly, %s %08x, len %08x",
|
|
|
|
|
ano ? "anode" : "sectors", a, len);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return NULL;
|
2012-04-06 19:21:09 +02:00
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4, ea->namelen + 1 + (ea_indirect(ea) ? 8 : 0), ex + 4))
|
2005-04-17 00:20:36 +02:00
|
|
|
return NULL;
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea))
|
|
|
|
|
return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(ea));
|
2011-05-08 20:44:32 +02:00
|
|
|
if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
|
2014-06-06 23:36:36 +02:00
|
|
|
pr_err("out of memory for EA\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
return NULL;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), ret)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
kfree(ret);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
ret[ea_valuelen(ea)] = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
return ret;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
pos += ea->namelen + ea_valuelen(ea) + 5;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Update or create extended attribute 'key' with value 'data'. Note that
|
|
|
|
|
* when this ea exists, it MUST have the same size as size of data.
|
|
|
|
|
* This driver can't change sizes of eas ('cause I just don't need it).
|
|
|
|
|
*/
|
|
|
|
|
|
2010-01-31 23:09:29 +01:00
|
|
|
void hpfs_set_ea(struct inode *inode, struct fnode *fnode, const char *key,
|
|
|
|
|
const char *data, int size)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
|
fnode_secno fno = inode->i_ino;
|
|
|
|
|
struct super_block *s = inode->i_sb;
|
|
|
|
|
unsigned pos;
|
|
|
|
|
int ano, len;
|
|
|
|
|
secno a;
|
|
|
|
|
unsigned char h[4];
|
|
|
|
|
struct extended_attribute *ea;
|
|
|
|
|
struct extended_attribute *ea_end = fnode_end_ea(fnode);
|
|
|
|
|
for (ea = fnode_ea(fnode); ea < ea_end; ea = next_ea(ea))
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if (ea_len(ea) == size)
|
2012-04-06 19:21:09 +02:00
|
|
|
set_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), data, size);
|
2011-05-08 20:44:32 +02:00
|
|
|
} else if (ea_valuelen(ea) == size) {
|
2005-04-17 00:20:36 +02:00
|
|
|
memcpy(ea_data(ea), data, size);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
a = le32_to_cpu(fnode->ea_secno);
|
|
|
|
|
len = le32_to_cpu(fnode->ea_size_l);
|
2012-04-06 20:30:07 +02:00
|
|
|
ano = fnode_in_anode(fnode);
|
2005-04-17 00:20:36 +02:00
|
|
|
pos = 0;
|
|
|
|
|
while (pos < len) {
|
|
|
|
|
char ex[4 + 255 + 1 + 8];
|
|
|
|
|
ea = (struct extended_attribute *)ex;
|
|
|
|
|
if (pos + 4 > len) {
|
|
|
|
|
hpfs_error(s, "EAs don't end correctly, %s %08x, len %08x",
|
|
|
|
|
ano ? "anode" : "sectors", a, len);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (hpfs_ea_read(s, a, ano, pos, 4, ex)) return;
|
2012-04-06 19:21:09 +02:00
|
|
|
if (hpfs_ea_read(s, a, ano, pos + 4, ea->namelen + 1 + (ea_indirect(ea) ? 8 : 0), ex + 4))
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
|
if (!strcmp(ea->name, key)) {
|
2012-04-06 19:21:09 +02:00
|
|
|
if (ea_indirect(ea)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if (ea_len(ea) == size)
|
2012-04-06 19:21:09 +02:00
|
|
|
set_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), data, size);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
else {
|
2011-05-08 20:44:32 +02:00
|
|
|
if (ea_valuelen(ea) == size)
|
2005-04-17 00:20:36 +02:00
|
|
|
hpfs_ea_write(s, a, ano, pos + 4 + ea->namelen + 1, size, data);
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
2011-05-08 20:44:32 +02:00
|
|
|
pos += ea->namelen + ea_valuelen(ea) + 5;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
if (!le16_to_cpu(fnode->ea_offs)) {
|
|
|
|
|
/*if (le16_to_cpu(fnode->ea_size_s)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
hpfs_error(s, "fnode %08x: ea_size_s == %03x, ea_offs == 0",
|
2011-05-08 20:44:26 +02:00
|
|
|
inode->i_ino, le16_to_cpu(fnode->ea_size_s));
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
|
}*/
|
2011-05-08 20:44:26 +02:00
|
|
|
fnode->ea_offs = cpu_to_le16(0xc4);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
if (le16_to_cpu(fnode->ea_offs) < 0xc4 || le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s) > 0x200) {
|
[PATCH] hpfs: fix printk format warnings
Fix hpfs printk warnings:
fs/hpfs/dir.c:87: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
fs/hpfs/dir.c:147: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long int'
fs/hpfs/dir.c:148: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long int'
fs/hpfs/dnode.c:537: warning: format '%08x' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
fs/hpfs/dnode.c:854: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'loff_t'
fs/hpfs/ea.c:247: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
fs/hpfs/inode.c:254: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
fs/hpfs/map.c:129: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'ino_t'
fs/hpfs/map.c:135: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'ino_t'
fs/hpfs/map.c:140: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'ino_t'
fs/hpfs/map.c:147: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'ino_t'
fs/hpfs/map.c:154: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'ino_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-07 05:37:05 +01:00
|
|
|
hpfs_error(s, "fnode %08lx: ea_offs == %03x, ea_size_s == %03x",
|
|
|
|
|
(unsigned long)inode->i_ino,
|
2012-04-13 07:24:37 +02:00
|
|
|
le16_to_cpu(fnode->ea_offs), le16_to_cpu(fnode->ea_size_s));
|
2005-04-17 00:20:36 +02:00
|
|
|
return;
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
if ((le16_to_cpu(fnode->ea_size_s) || !le32_to_cpu(fnode->ea_size_l)) &&
|
|
|
|
|
le16_to_cpu(fnode->ea_offs) + le16_to_cpu(fnode->acl_size_s) + le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5 <= 0x200) {
|
2005-04-17 00:20:36 +02:00
|
|
|
ea = fnode_end_ea(fnode);
|
|
|
|
|
*(char *)ea = 0;
|
|
|
|
|
ea->namelen = strlen(key);
|
2011-05-08 20:44:32 +02:00
|
|
|
ea->valuelen_lo = size;
|
|
|
|
|
ea->valuelen_hi = size >> 8;
|
2005-04-17 00:20:36 +02:00
|
|
|
strcpy(ea->name, key);
|
|
|
|
|
memcpy(ea_data(ea), data, size);
|
2011-05-08 20:44:26 +02:00
|
|
|
fnode->ea_size_s = cpu_to_le16(le16_to_cpu(fnode->ea_size_s) + strlen(key) + size + 5);
|
2005-04-17 00:20:36 +02:00
|
|
|
goto ret;
|
|
|
|
|
}
|
|
|
|
|
/* Most the code here is 99.9993422% unused. I hope there are no bugs.
|
|
|
|
|
But what .. HPFS.IFS has also bugs in ea management. */
|
2011-05-08 20:44:26 +02:00
|
|
|
if (le16_to_cpu(fnode->ea_size_s) && !le32_to_cpu(fnode->ea_size_l)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
secno n;
|
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
char *data;
|
2011-05-08 20:43:06 +02:00
|
|
|
if (!(n = hpfs_alloc_sector(s, fno, 1, 0))) return;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(data = hpfs_get_sector(s, n, &bh))) {
|
|
|
|
|
hpfs_free_sectors(s, n, 1);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
memcpy(data, fnode_ea(fnode), le16_to_cpu(fnode->ea_size_s));
|
|
|
|
|
fnode->ea_size_l = cpu_to_le32(le16_to_cpu(fnode->ea_size_s));
|
|
|
|
|
fnode->ea_size_s = cpu_to_le16(0);
|
|
|
|
|
fnode->ea_secno = cpu_to_le32(n);
|
2012-04-06 20:30:07 +02:00
|
|
|
fnode->flags &= ~FNODE_anode;
|
2005-04-17 00:20:36 +02:00
|
|
|
mark_buffer_dirty(bh);
|
|
|
|
|
brelse(bh);
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
pos = le32_to_cpu(fnode->ea_size_l) + 5 + strlen(key) + size;
|
|
|
|
|
len = (le32_to_cpu(fnode->ea_size_l) + 511) >> 9;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (pos >= 30000) goto bail;
|
|
|
|
|
while (((pos + 511) >> 9) > len) {
|
|
|
|
|
if (!len) {
|
2011-05-08 20:44:26 +02:00
|
|
|
secno q = hpfs_alloc_sector(s, fno, 1, 0);
|
|
|
|
|
if (!q) goto bail;
|
|
|
|
|
fnode->ea_secno = cpu_to_le32(q);
|
2012-04-06 20:30:07 +02:00
|
|
|
fnode->flags &= ~FNODE_anode;
|
2005-04-17 00:20:36 +02:00
|
|
|
len++;
|
2012-04-06 20:30:07 +02:00
|
|
|
} else if (!fnode_in_anode(fnode)) {
|
2011-05-08 20:44:26 +02:00
|
|
|
if (hpfs_alloc_if_possible(s, le32_to_cpu(fnode->ea_secno) + len)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
len++;
|
|
|
|
|
} else {
|
|
|
|
|
/* Aargh... don't know how to create ea anodes :-( */
|
|
|
|
|
/*struct buffer_head *bh;
|
|
|
|
|
struct anode *anode;
|
|
|
|
|
anode_secno a_s;
|
|
|
|
|
if (!(anode = hpfs_alloc_anode(s, fno, &a_s, &bh)))
|
|
|
|
|
goto bail;
|
2011-05-08 20:44:26 +02:00
|
|
|
anode->up = cpu_to_le32(fno);
|
2005-04-17 00:20:36 +02:00
|
|
|
anode->btree.fnode_parent = 1;
|
|
|
|
|
anode->btree.n_free_nodes--;
|
|
|
|
|
anode->btree.n_used_nodes++;
|
2011-05-08 20:44:26 +02:00
|
|
|
anode->btree.first_free = cpu_to_le16(le16_to_cpu(anode->btree.first_free) + 12);
|
|
|
|
|
anode->u.external[0].disk_secno = cpu_to_le32(le32_to_cpu(fnode->ea_secno));
|
|
|
|
|
anode->u.external[0].file_secno = cpu_to_le32(0);
|
|
|
|
|
anode->u.external[0].length = cpu_to_le32(len);
|
2005-04-17 00:20:36 +02:00
|
|
|
mark_buffer_dirty(bh);
|
|
|
|
|
brelse(bh);
|
2012-04-06 20:30:07 +02:00
|
|
|
fnode->flags |= FNODE_anode;
|
2011-05-08 20:44:26 +02:00
|
|
|
fnode->ea_secno = cpu_to_le32(a_s);*/
|
2005-04-17 00:20:36 +02:00
|
|
|
secno new_sec;
|
|
|
|
|
int i;
|
2011-05-08 20:43:06 +02:00
|
|
|
if (!(new_sec = hpfs_alloc_sector(s, fno, 1, 1 - ((pos + 511) >> 9))))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto bail;
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
struct buffer_head *bh1, *bh2;
|
|
|
|
|
void *b1, *b2;
|
2011-05-08 20:44:26 +02:00
|
|
|
if (!(b1 = hpfs_map_sector(s, le32_to_cpu(fnode->ea_secno) + i, &bh1, len - i - 1))) {
|
2005-04-17 00:20:36 +02:00
|
|
|
hpfs_free_sectors(s, new_sec, (pos + 511) >> 9);
|
|
|
|
|
goto bail;
|
|
|
|
|
}
|
|
|
|
|
if (!(b2 = hpfs_get_sector(s, new_sec + i, &bh2))) {
|
|
|
|
|
brelse(bh1);
|
|
|
|
|
hpfs_free_sectors(s, new_sec, (pos + 511) >> 9);
|
|
|
|
|
goto bail;
|
|
|
|
|
}
|
|
|
|
|
memcpy(b2, b1, 512);
|
|
|
|
|
brelse(bh1);
|
|
|
|
|
mark_buffer_dirty(bh2);
|
|
|
|
|
brelse(bh2);
|
|
|
|
|
}
|
2011-05-08 20:44:26 +02:00
|
|
|
hpfs_free_sectors(s, le32_to_cpu(fnode->ea_secno), len);
|
|
|
|
|
fnode->ea_secno = cpu_to_le32(new_sec);
|
2005-04-17 00:20:36 +02:00
|
|
|
len = (pos + 511) >> 9;
|
|
|
|
|
}
|
|
|
|
|
}
|
2012-04-06 20:30:07 +02:00
|
|
|
if (fnode_in_anode(fnode)) {
|
2011-05-08 20:44:26 +02:00
|
|
|
if (hpfs_add_sector_to_btree(s, le32_to_cpu(fnode->ea_secno),
|
2005-04-17 00:20:36 +02:00
|
|
|
0, len) != -1) {
|
|
|
|
|
len++;
|
|
|
|
|
} else {
|
|
|
|
|
goto bail;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
h[0] = 0;
|
|
|
|
|
h[1] = strlen(key);
|
|
|
|
|
h[2] = size & 0xff;
|
|
|
|
|
h[3] = size >> 8;
|
2012-04-06 20:30:07 +02:00
|
|
|
if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode_in_anode(fnode), le32_to_cpu(fnode->ea_size_l), 4, h)) goto bail;
|
|
|
|
|
if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode_in_anode(fnode), le32_to_cpu(fnode->ea_size_l) + 4, h[1] + 1, key)) goto bail;
|
|
|
|
|
if (hpfs_ea_write(s, le32_to_cpu(fnode->ea_secno), fnode_in_anode(fnode), le32_to_cpu(fnode->ea_size_l) + 5 + h[1], size, data)) goto bail;
|
2011-05-08 20:44:26 +02:00
|
|
|
fnode->ea_size_l = cpu_to_le32(pos);
|
2005-04-17 00:20:36 +02:00
|
|
|
ret:
|
|
|
|
|
hpfs_i(inode)->i_ea_size += 5 + strlen(key) + size;
|
|
|
|
|
return;
|
|
|
|
|
bail:
|
2011-05-08 20:44:26 +02:00
|
|
|
if (le32_to_cpu(fnode->ea_secno))
|
2012-04-06 20:30:07 +02:00
|
|
|
if (fnode_in_anode(fnode)) hpfs_truncate_btree(s, le32_to_cpu(fnode->ea_secno), 1, (le32_to_cpu(fnode->ea_size_l) + 511) >> 9);
|
2011-05-08 20:44:26 +02:00
|
|
|
else hpfs_free_sectors(s, le32_to_cpu(fnode->ea_secno) + ((le32_to_cpu(fnode->ea_size_l) + 511) >> 9), len - ((le32_to_cpu(fnode->ea_size_l) + 511) >> 9));
|
|
|
|
|
else fnode->ea_secno = fnode->ea_size_l = cpu_to_le32(0);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|