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 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* linux/fs/hfsplus/inode.c
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2001
|
|
|
|
|
* Brad Boyer (flar@allandria.com)
|
|
|
|
|
* (C) 2003 Ardis Technologies <roman@ardistech.com>
|
|
|
|
|
*
|
|
|
|
|
* Inode handling routines
|
|
|
|
|
*/
|
|
|
|
|
|
2010-11-23 21:38:21 +08:00
|
|
|
#include <linux/blkdev.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/mm.h>
|
|
|
|
|
#include <linux/fs.h>
|
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
|
#include <linux/mpage.h>
|
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-21 05:22:52 +08:00
|
|
|
#include <linux/sched.h>
|
2017-02-03 00:54:15 +08:00
|
|
|
#include <linux/cred.h>
|
2015-02-23 00:58:50 +08:00
|
|
|
#include <linux/uio.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
#include "hfsplus_fs.h"
|
|
|
|
|
#include "hfsplus_raw.h"
|
2013-02-28 09:03:04 +08:00
|
|
|
#include "xattr.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
static int hfsplus_readpage(struct file *file, struct page *page)
|
|
|
|
|
{
|
|
|
|
|
return block_read_full_page(page, hfsplus_get_block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hfsplus_writepage(struct page *page, struct writeback_control *wbc)
|
|
|
|
|
{
|
|
|
|
|
return block_write_full_page(page, hfsplus_get_block, wbc);
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-15 18:55:07 +08:00
|
|
|
static void hfsplus_write_failed(struct address_space *mapping, loff_t to)
|
|
|
|
|
{
|
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
|
|
|
|
|
|
if (to > inode->i_size) {
|
2013-09-13 06:13:56 +08:00
|
|
|
truncate_pagecache(inode, inode->i_size);
|
2012-12-15 18:55:07 +08:00
|
|
|
hfsplus_file_truncate(inode);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-16 16:25:09 +08:00
|
|
|
static int hfsplus_write_begin(struct file *file, struct address_space *mapping,
|
|
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
|
|
struct page **pagep, void **fsdata)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-06-04 17:29:55 +08:00
|
|
|
int ret;
|
|
|
|
|
|
2007-10-16 16:25:09 +08:00
|
|
|
*pagep = NULL;
|
2010-06-04 17:29:55 +08:00
|
|
|
ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
|
2007-10-16 16:25:09 +08:00
|
|
|
hfsplus_get_block,
|
2010-10-01 11:43:31 +08:00
|
|
|
&HFSPLUS_I(mapping->host)->phys_size);
|
2012-12-15 18:55:07 +08:00
|
|
|
if (unlikely(ret))
|
|
|
|
|
hfsplus_write_failed(mapping, pos + len);
|
2010-06-04 17:29:55 +08:00
|
|
|
|
|
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static sector_t hfsplus_bmap(struct address_space *mapping, sector_t block)
|
|
|
|
|
{
|
|
|
|
|
return generic_block_bmap(mapping, block, hfsplus_get_block);
|
|
|
|
|
}
|
|
|
|
|
|
2005-10-21 15:20:48 +08:00
|
|
|
static int hfsplus_releasepage(struct page *page, gfp_t mask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct inode *inode = page->mapping->host;
|
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
|
struct hfs_btree *tree;
|
|
|
|
|
struct hfs_bnode *node;
|
|
|
|
|
u32 nidx;
|
|
|
|
|
int i, res = 1;
|
|
|
|
|
|
|
|
|
|
switch (inode->i_ino) {
|
|
|
|
|
case HFSPLUS_EXT_CNID:
|
2010-10-01 11:42:59 +08:00
|
|
|
tree = HFSPLUS_SB(sb)->ext_tree;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
case HFSPLUS_CAT_CNID:
|
2010-10-01 11:42:59 +08:00
|
|
|
tree = HFSPLUS_SB(sb)->cat_tree;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
case HFSPLUS_ATTR_CNID:
|
2010-10-01 11:42:59 +08:00
|
|
|
tree = HFSPLUS_SB(sb)->attr_tree;
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
BUG();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2008-05-13 05:02:21 +08:00
|
|
|
if (!tree)
|
|
|
|
|
return 0;
|
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 20:29:47 +08:00
|
|
|
if (tree->node_size >= PAGE_SIZE) {
|
2010-12-17 00:08:38 +08:00
|
|
|
nidx = page->index >>
|
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 20:29:47 +08:00
|
|
|
(tree->node_size_shift - PAGE_SHIFT);
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_lock(&tree->hash_lock);
|
|
|
|
|
node = hfs_bnode_findhash(tree, nidx);
|
|
|
|
|
if (!node)
|
|
|
|
|
;
|
|
|
|
|
else if (atomic_read(&node->refcnt))
|
|
|
|
|
res = 0;
|
|
|
|
|
if (res && node) {
|
|
|
|
|
hfs_bnode_unhash(node);
|
|
|
|
|
hfs_bnode_free(node);
|
|
|
|
|
}
|
|
|
|
|
spin_unlock(&tree->hash_lock);
|
|
|
|
|
} else {
|
2010-12-17 00:08:38 +08:00
|
|
|
nidx = page->index <<
|
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 20:29:47 +08:00
|
|
|
(PAGE_SHIFT - tree->node_size_shift);
|
|
|
|
|
i = 1 << (PAGE_SHIFT - tree->node_size_shift);
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_lock(&tree->hash_lock);
|
|
|
|
|
do {
|
|
|
|
|
node = hfs_bnode_findhash(tree, nidx++);
|
|
|
|
|
if (!node)
|
|
|
|
|
continue;
|
|
|
|
|
if (atomic_read(&node->refcnt)) {
|
|
|
|
|
res = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
hfs_bnode_unhash(node);
|
|
|
|
|
hfs_bnode_free(node);
|
|
|
|
|
} while (--i && nidx < tree->node_count);
|
|
|
|
|
spin_unlock(&tree->hash_lock);
|
|
|
|
|
}
|
|
|
|
|
return res ? try_to_free_buffers(page) : 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-07 23:51:58 +08:00
|
|
|
static ssize_t hfsplus_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct file *file = iocb->ki_filp;
|
2012-12-15 18:55:07 +08:00
|
|
|
struct address_space *mapping = file->f_mapping;
|
2015-12-05 12:45:44 +08:00
|
|
|
struct inode *inode = mapping->host;
|
2014-03-05 11:38:00 +08:00
|
|
|
size_t count = iov_iter_count(iter);
|
2010-06-04 17:29:53 +08:00
|
|
|
ssize_t ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-04-07 23:51:58 +08:00
|
|
|
ret = blockdev_direct_IO(iocb, inode, iter, hfsplus_get_block);
|
2010-06-04 17:29:53 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* In case of error extending write may have instantiated a few
|
|
|
|
|
* blocks outside i_size. Trim these off again.
|
|
|
|
|
*/
|
2015-03-16 19:33:52 +08:00
|
|
|
if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) {
|
2010-06-04 17:29:53 +08:00
|
|
|
loff_t isize = i_size_read(inode);
|
2016-04-07 23:51:58 +08:00
|
|
|
loff_t end = iocb->ki_pos + count;
|
2010-06-04 17:29:53 +08:00
|
|
|
|
|
|
|
|
if (end > isize)
|
2012-12-15 18:55:07 +08:00
|
|
|
hfsplus_write_failed(mapping, end);
|
2010-06-04 17:29:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hfsplus_writepages(struct address_space *mapping,
|
|
|
|
|
struct writeback_control *wbc)
|
|
|
|
|
{
|
|
|
|
|
return mpage_writepages(mapping, wbc, hfsplus_get_block);
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-28 19:26:44 +08:00
|
|
|
const struct address_space_operations hfsplus_btree_aops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.readpage = hfsplus_readpage,
|
|
|
|
|
.writepage = hfsplus_writepage,
|
2007-10-16 16:25:09 +08:00
|
|
|
.write_begin = hfsplus_write_begin,
|
|
|
|
|
.write_end = generic_write_end,
|
2005-04-17 06:20:36 +08:00
|
|
|
.bmap = hfsplus_bmap,
|
|
|
|
|
.releasepage = hfsplus_releasepage,
|
|
|
|
|
};
|
|
|
|
|
|
2006-06-28 19:26:44 +08:00
|
|
|
const struct address_space_operations hfsplus_aops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.readpage = hfsplus_readpage,
|
|
|
|
|
.writepage = hfsplus_writepage,
|
2007-10-16 16:25:09 +08:00
|
|
|
.write_begin = hfsplus_write_begin,
|
|
|
|
|
.write_end = generic_write_end,
|
2005-04-17 06:20:36 +08:00
|
|
|
.bmap = hfsplus_bmap,
|
|
|
|
|
.direct_IO = hfsplus_direct_IO,
|
|
|
|
|
.writepages = hfsplus_writepages,
|
|
|
|
|
};
|
|
|
|
|
|
2009-02-20 13:55:13 +08:00
|
|
|
const struct dentry_operations hfsplus_dentry_operations = {
|
2007-07-16 14:41:23 +08:00
|
|
|
.d_hash = hfsplus_hash_dentry,
|
|
|
|
|
.d_compare = hfsplus_compare_dentry,
|
|
|
|
|
};
|
|
|
|
|
|
2010-12-17 00:08:38 +08:00
|
|
|
static void hfsplus_get_perms(struct inode *inode,
|
|
|
|
|
struct hfsplus_perm *perms, int dir)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-10-01 11:42:59 +08:00
|
|
|
struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
|
2005-04-17 06:20:36 +08:00
|
|
|
u16 mode;
|
|
|
|
|
|
|
|
|
|
mode = be16_to_cpu(perms->mode);
|
|
|
|
|
|
2012-02-08 08:27:17 +08:00
|
|
|
i_uid_write(inode, be32_to_cpu(perms->owner));
|
|
|
|
|
if (!i_uid_read(inode) && !mode)
|
2010-10-01 11:42:59 +08:00
|
|
|
inode->i_uid = sbi->uid;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-02-08 08:27:17 +08:00
|
|
|
i_gid_write(inode, be32_to_cpu(perms->group));
|
|
|
|
|
if (!i_gid_read(inode) && !mode)
|
2010-10-01 11:42:59 +08:00
|
|
|
inode->i_gid = sbi->gid;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
if (dir) {
|
2010-10-01 11:42:59 +08:00
|
|
|
mode = mode ? (mode & S_IALLUGO) : (S_IRWXUGO & ~(sbi->umask));
|
2005-04-17 06:20:36 +08:00
|
|
|
mode |= S_IFDIR;
|
|
|
|
|
} else if (!mode)
|
2010-10-01 11:42:59 +08:00
|
|
|
mode = S_IFREG | ((S_IRUGO|S_IWUGO) & ~(sbi->umask));
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_mode = mode;
|
|
|
|
|
|
2010-10-01 11:43:31 +08:00
|
|
|
HFSPLUS_I(inode)->userflags = perms->userflags;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (perms->rootflags & HFSPLUS_FLG_IMMUTABLE)
|
|
|
|
|
inode->i_flags |= S_IMMUTABLE;
|
|
|
|
|
else
|
|
|
|
|
inode->i_flags &= ~S_IMMUTABLE;
|
|
|
|
|
if (perms->rootflags & HFSPLUS_FLG_APPEND)
|
|
|
|
|
inode->i_flags |= S_APPEND;
|
|
|
|
|
else
|
|
|
|
|
inode->i_flags &= ~S_APPEND;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hfsplus_file_open(struct inode *inode, struct file *file)
|
|
|
|
|
{
|
|
|
|
|
if (HFSPLUS_IS_RSRC(inode))
|
2010-10-01 11:43:31 +08:00
|
|
|
inode = HFSPLUS_I(inode)->rsrc_inode;
|
2008-10-19 11:28:01 +08:00
|
|
|
if (!(file->f_flags & O_LARGEFILE) && i_size_read(inode) > MAX_NON_LFS)
|
|
|
|
|
return -EOVERFLOW;
|
2010-10-01 11:43:31 +08:00
|
|
|
atomic_inc(&HFSPLUS_I(inode)->opencnt);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hfsplus_file_release(struct inode *inode, struct file *file)
|
|
|
|
|
{
|
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
|
|
|
|
|
|
if (HFSPLUS_IS_RSRC(inode))
|
2010-10-01 11:43:31 +08:00
|
|
|
inode = HFSPLUS_I(inode)->rsrc_inode;
|
|
|
|
|
if (atomic_dec_and_test(&HFSPLUS_I(inode)->opencnt)) {
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_lock(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
hfsplus_file_truncate(inode);
|
|
|
|
|
if (inode->i_flags & S_DEAD) {
|
2010-10-01 11:42:59 +08:00
|
|
|
hfsplus_delete_cat(inode->i_ino,
|
|
|
|
|
HFSPLUS_SB(sb)->hidden_dir, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
hfsplus_delete_inode(inode);
|
|
|
|
|
}
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-04 17:29:59 +08:00
|
|
|
static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)
|
|
|
|
|
{
|
2015-03-18 06:25:59 +08:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2010-06-04 17:29:59 +08:00
|
|
|
int error;
|
|
|
|
|
|
2016-05-26 22:55:18 +08:00
|
|
|
error = setattr_prepare(dentry, attr);
|
2010-06-04 17:29:59 +08:00
|
|
|
if (error)
|
|
|
|
|
return error;
|
2010-06-04 17:30:02 +08:00
|
|
|
|
|
|
|
|
if ((attr->ia_valid & ATTR_SIZE) &&
|
|
|
|
|
attr->ia_size != i_size_read(inode)) {
|
2011-06-25 02:29:45 +08:00
|
|
|
inode_dio_wait(inode);
|
2015-04-17 03:47:15 +08:00
|
|
|
if (attr->ia_size > inode->i_size) {
|
|
|
|
|
error = generic_cont_expand_simple(inode,
|
|
|
|
|
attr->ia_size);
|
|
|
|
|
if (error)
|
|
|
|
|
return error;
|
|
|
|
|
}
|
2012-12-15 18:55:07 +08:00
|
|
|
truncate_setsize(inode, attr->ia_size);
|
|
|
|
|
hfsplus_file_truncate(inode);
|
2018-10-31 06:06:27 +08:00
|
|
|
inode->i_mtime = inode->i_ctime = current_time(inode);
|
2010-06-04 17:30:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
setattr_copy(inode, attr);
|
|
|
|
|
mark_inode_dirty(inode);
|
2013-09-12 05:24:30 +08:00
|
|
|
|
2010-06-04 17:30:02 +08:00
|
|
|
return 0;
|
2010-06-04 17:29:59 +08:00
|
|
|
}
|
|
|
|
|
|
2019-01-04 07:27:46 +08:00
|
|
|
int hfsplus_getattr(const struct path *path, struct kstat *stat,
|
|
|
|
|
u32 request_mask, unsigned int query_flags)
|
|
|
|
|
{
|
|
|
|
|
struct inode *inode = d_inode(path->dentry);
|
|
|
|
|
struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
|
|
|
|
|
|
|
|
|
|
if (inode->i_flags & S_APPEND)
|
|
|
|
|
stat->attributes |= STATX_ATTR_APPEND;
|
|
|
|
|
if (inode->i_flags & S_IMMUTABLE)
|
|
|
|
|
stat->attributes |= STATX_ATTR_IMMUTABLE;
|
|
|
|
|
if (hip->userflags & HFSPLUS_FLG_NODUMP)
|
|
|
|
|
stat->attributes |= STATX_ATTR_NODUMP;
|
|
|
|
|
|
|
|
|
|
stat->attributes_mask |= STATX_ATTR_APPEND | STATX_ATTR_IMMUTABLE |
|
|
|
|
|
STATX_ATTR_NODUMP;
|
|
|
|
|
|
|
|
|
|
generic_fillattr(inode, stat);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-17 08:44:56 +08:00
|
|
|
int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,
|
|
|
|
|
int datasync)
|
2010-07-04 16:24:09 +08:00
|
|
|
{
|
2010-11-23 21:38:06 +08:00
|
|
|
struct inode *inode = file->f_mapping->host;
|
2010-11-23 21:38:15 +08:00
|
|
|
struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
|
2010-11-23 21:38:06 +08:00
|
|
|
struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
|
2010-11-23 21:38:15 +08:00
|
|
|
int error = 0, error2;
|
2010-07-04 16:24:09 +08:00
|
|
|
|
2017-07-08 03:20:52 +08:00
|
|
|
error = file_write_and_wait_range(file, start, end);
|
2011-07-17 08:44:56 +08:00
|
|
|
if (error)
|
|
|
|
|
return error;
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_lock(inode);
|
2011-07-17 08:44:56 +08:00
|
|
|
|
2010-11-23 21:38:06 +08:00
|
|
|
/*
|
|
|
|
|
* Sync inode metadata into the catalog and extent trees.
|
|
|
|
|
*/
|
|
|
|
|
sync_inode_metadata(inode, 1);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* And explicitly write out the btrees.
|
|
|
|
|
*/
|
2010-11-23 21:38:15 +08:00
|
|
|
if (test_and_clear_bit(HFSPLUS_I_CAT_DIRTY, &hip->flags))
|
|
|
|
|
error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping);
|
|
|
|
|
|
|
|
|
|
if (test_and_clear_bit(HFSPLUS_I_EXT_DIRTY, &hip->flags)) {
|
2010-12-17 00:08:38 +08:00
|
|
|
error2 =
|
|
|
|
|
filemap_write_and_wait(sbi->ext_tree->inode->i_mapping);
|
2010-11-23 21:38:15 +08:00
|
|
|
if (!error)
|
|
|
|
|
error = error2;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-28 09:03:04 +08:00
|
|
|
if (test_and_clear_bit(HFSPLUS_I_ATTR_DIRTY, &hip->flags)) {
|
|
|
|
|
if (sbi->attr_tree) {
|
|
|
|
|
error2 =
|
|
|
|
|
filemap_write_and_wait(
|
|
|
|
|
sbi->attr_tree->inode->i_mapping);
|
|
|
|
|
if (!error)
|
|
|
|
|
error = error2;
|
|
|
|
|
} else {
|
2013-05-01 06:27:55 +08:00
|
|
|
pr_err("sync non-existent attributes tree\n");
|
2013-02-28 09:03:04 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-23 21:38:15 +08:00
|
|
|
if (test_and_clear_bit(HFSPLUS_I_ALLOC_DIRTY, &hip->flags)) {
|
|
|
|
|
error2 = filemap_write_and_wait(sbi->alloc_file->i_mapping);
|
|
|
|
|
if (!error)
|
|
|
|
|
error = error2;
|
|
|
|
|
}
|
|
|
|
|
|
2010-11-23 21:38:21 +08:00
|
|
|
if (!test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags))
|
|
|
|
|
blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
|
|
|
|
|
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2011-07-17 08:44:56 +08:00
|
|
|
|
2010-11-23 21:38:06 +08:00
|
|
|
return error;
|
2010-07-04 16:24:09 +08:00
|
|
|
}
|
|
|
|
|
|
2007-02-12 16:55:39 +08:00
|
|
|
static const struct inode_operations hfsplus_file_inode_operations = {
|
2010-06-04 17:29:59 +08:00
|
|
|
.setattr = hfsplus_setattr,
|
2019-01-04 07:27:46 +08:00
|
|
|
.getattr = hfsplus_getattr,
|
2005-04-17 06:20:36 +08:00
|
|
|
.listxattr = hfsplus_listxattr,
|
|
|
|
|
};
|
|
|
|
|
|
2006-03-28 17:56:42 +08:00
|
|
|
static const struct file_operations hfsplus_file_operations = {
|
2010-12-17 00:08:40 +08:00
|
|
|
.llseek = generic_file_llseek,
|
2014-04-03 02:33:16 +08:00
|
|
|
.read_iter = generic_file_read_iter,
|
2014-04-03 15:17:43 +08:00
|
|
|
.write_iter = generic_file_write_iter,
|
2005-04-17 06:20:36 +08:00
|
|
|
.mmap = generic_file_mmap,
|
2007-06-01 17:49:19 +08:00
|
|
|
.splice_read = generic_file_splice_read,
|
2010-07-04 16:24:09 +08:00
|
|
|
.fsync = hfsplus_file_fsync,
|
2005-04-17 06:20:36 +08:00
|
|
|
.open = hfsplus_file_open,
|
|
|
|
|
.release = hfsplus_file_release,
|
2010-04-27 22:24:20 +08:00
|
|
|
.unlocked_ioctl = hfsplus_ioctl,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
2018-02-07 07:49:02 +08:00
|
|
|
struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,
|
|
|
|
|
umode_t mode)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-10-01 11:42:59 +08:00
|
|
|
struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct inode *inode = new_inode(sb);
|
2010-10-01 11:43:31 +08:00
|
|
|
struct hfsplus_inode_info *hip;
|
2010-10-01 11:42:59 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!inode)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2010-10-01 11:42:59 +08:00
|
|
|
inode->i_ino = sbi->next_cnid++;
|
2018-02-07 07:49:02 +08:00
|
|
|
inode_init_owner(inode, dir, mode);
|
2011-10-28 20:13:29 +08:00
|
|
|
set_nlink(inode, 1);
|
2016-09-14 22:48:05 +08:00
|
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
|
2010-10-01 11:43:31 +08:00
|
|
|
|
|
|
|
|
hip = HFSPLUS_I(inode);
|
|
|
|
|
INIT_LIST_HEAD(&hip->open_dir_list);
|
2016-05-13 08:02:09 +08:00
|
|
|
spin_lock_init(&hip->open_dir_lock);
|
2010-10-01 11:43:31 +08:00
|
|
|
mutex_init(&hip->extents_lock);
|
|
|
|
|
atomic_set(&hip->opencnt, 0);
|
2010-11-23 21:38:13 +08:00
|
|
|
hip->extent_state = 0;
|
2010-10-01 11:43:31 +08:00
|
|
|
hip->flags = 0;
|
2012-03-14 00:10:34 +08:00
|
|
|
hip->userflags = 0;
|
2014-03-11 06:49:51 +08:00
|
|
|
hip->subfolders = 0;
|
2010-10-01 11:43:31 +08:00
|
|
|
memset(hip->first_extents, 0, sizeof(hfsplus_extent_rec));
|
|
|
|
|
memset(hip->cached_extents, 0, sizeof(hfsplus_extent_rec));
|
|
|
|
|
hip->alloc_blocks = 0;
|
|
|
|
|
hip->first_blocks = 0;
|
|
|
|
|
hip->cached_start = 0;
|
|
|
|
|
hip->cached_blocks = 0;
|
|
|
|
|
hip->phys_size = 0;
|
|
|
|
|
hip->fs_blocks = 0;
|
|
|
|
|
hip->rsrc_inode = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
|
|
|
inode->i_size = 2;
|
2010-10-01 11:42:59 +08:00
|
|
|
sbi->folder_count++;
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_op = &hfsplus_dir_inode_operations;
|
|
|
|
|
inode->i_fop = &hfsplus_dir_operations;
|
|
|
|
|
} else if (S_ISREG(inode->i_mode)) {
|
2010-10-01 11:42:59 +08:00
|
|
|
sbi->file_count++;
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_op = &hfsplus_file_inode_operations;
|
|
|
|
|
inode->i_fop = &hfsplus_file_operations;
|
|
|
|
|
inode->i_mapping->a_ops = &hfsplus_aops;
|
2010-10-01 11:43:31 +08:00
|
|
|
hip->clump_blocks = sbi->data_clump_blocks;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (S_ISLNK(inode->i_mode)) {
|
2010-10-01 11:42:59 +08:00
|
|
|
sbi->file_count++;
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_op = &page_symlink_inode_operations;
|
2015-11-17 14:07:57 +08:00
|
|
|
inode_nohighmem(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_mapping->a_ops = &hfsplus_aops;
|
2010-10-01 11:43:31 +08:00
|
|
|
hip->clump_blocks = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else
|
2010-10-01 11:42:59 +08:00
|
|
|
sbi->file_count++;
|
2005-04-17 06:20:36 +08:00
|
|
|
insert_inode_hash(inode);
|
|
|
|
|
mark_inode_dirty(inode);
|
2012-07-12 22:26:31 +08:00
|
|
|
hfsplus_mark_mdb_dirty(sb);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return inode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void hfsplus_delete_inode(struct inode *inode)
|
|
|
|
|
{
|
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
|
|
|
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
2010-10-01 11:42:59 +08:00
|
|
|
HFSPLUS_SB(sb)->folder_count--;
|
2012-07-12 22:26:31 +08:00
|
|
|
hfsplus_mark_mdb_dirty(sb);
|
2005-04-17 06:20:36 +08:00
|
|
|
return;
|
|
|
|
|
}
|
2010-10-01 11:42:59 +08:00
|
|
|
HFSPLUS_SB(sb)->file_count--;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (S_ISREG(inode->i_mode)) {
|
|
|
|
|
if (!inode->i_nlink) {
|
|
|
|
|
inode->i_size = 0;
|
|
|
|
|
hfsplus_file_truncate(inode);
|
|
|
|
|
}
|
|
|
|
|
} else if (S_ISLNK(inode->i_mode)) {
|
|
|
|
|
inode->i_size = 0;
|
|
|
|
|
hfsplus_file_truncate(inode);
|
|
|
|
|
}
|
2012-07-12 22:26:31 +08:00
|
|
|
hfsplus_mark_mdb_dirty(sb);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void hfsplus_inode_read_fork(struct inode *inode, struct hfsplus_fork_raw *fork)
|
|
|
|
|
{
|
|
|
|
|
struct super_block *sb = inode->i_sb;
|
2010-10-01 11:42:59 +08:00
|
|
|
struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
|
2010-10-01 11:43:31 +08:00
|
|
|
struct hfsplus_inode_info *hip = HFSPLUS_I(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 count;
|
|
|
|
|
int i;
|
|
|
|
|
|
2010-10-01 11:43:31 +08:00
|
|
|
memcpy(&hip->first_extents, &fork->extents, sizeof(hfsplus_extent_rec));
|
2005-04-17 06:20:36 +08:00
|
|
|
for (count = 0, i = 0; i < 8; i++)
|
|
|
|
|
count += be32_to_cpu(fork->extents[i].block_count);
|
2010-10-01 11:43:31 +08:00
|
|
|
hip->first_blocks = count;
|
|
|
|
|
memset(hip->cached_extents, 0, sizeof(hfsplus_extent_rec));
|
|
|
|
|
hip->cached_start = 0;
|
|
|
|
|
hip->cached_blocks = 0;
|
|
|
|
|
|
|
|
|
|
hip->alloc_blocks = be32_to_cpu(fork->total_blocks);
|
|
|
|
|
hip->phys_size = inode->i_size = be64_to_cpu(fork->total_size);
|
|
|
|
|
hip->fs_blocks =
|
|
|
|
|
(inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
|
|
|
|
|
inode_set_bytes(inode, hip->fs_blocks << sb->s_blocksize_bits);
|
|
|
|
|
hip->clump_blocks =
|
2010-10-01 11:42:59 +08:00
|
|
|
be32_to_cpu(fork->clump_size) >> sbi->alloc_blksz_shift;
|
2010-10-01 11:43:31 +08:00
|
|
|
if (!hip->clump_blocks) {
|
|
|
|
|
hip->clump_blocks = HFSPLUS_IS_RSRC(inode) ?
|
2010-10-01 11:42:59 +08:00
|
|
|
sbi->rsrc_clump_blocks :
|
|
|
|
|
sbi->data_clump_blocks;
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2010-12-17 00:08:38 +08:00
|
|
|
void hfsplus_inode_write_fork(struct inode *inode,
|
|
|
|
|
struct hfsplus_fork_raw *fork)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-10-01 11:43:31 +08:00
|
|
|
memcpy(&fork->extents, &HFSPLUS_I(inode)->first_extents,
|
2005-04-17 06:20:36 +08:00
|
|
|
sizeof(hfsplus_extent_rec));
|
|
|
|
|
fork->total_size = cpu_to_be64(inode->i_size);
|
2010-10-01 11:43:31 +08:00
|
|
|
fork->total_blocks = cpu_to_be32(HFSPLUS_I(inode)->alloc_blocks);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
|
|
|
|
|
{
|
|
|
|
|
hfsplus_cat_entry entry;
|
|
|
|
|
int res = 0;
|
|
|
|
|
u16 type;
|
|
|
|
|
|
|
|
|
|
type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
|
|
|
|
|
|
2010-10-14 21:54:28 +08:00
|
|
|
HFSPLUS_I(inode)->linkid = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (type == HFSPLUS_FOLDER) {
|
|
|
|
|
struct hfsplus_cat_folder *folder = &entry.folder;
|
|
|
|
|
|
|
|
|
|
if (fd->entrylength < sizeof(struct hfsplus_cat_folder))
|
|
|
|
|
/* panic? */;
|
|
|
|
|
hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_folder));
|
|
|
|
|
hfsplus_get_perms(inode, &folder->permissions, 1);
|
2011-10-28 20:13:29 +08:00
|
|
|
set_nlink(inode, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_size = 2 + be32_to_cpu(folder->valence);
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 10:36:02 +08:00
|
|
|
inode->i_atime = timespec_to_timespec64(hfsp_mt2ut(folder->access_date));
|
|
|
|
|
inode->i_mtime = timespec_to_timespec64(hfsp_mt2ut(folder->content_mod_date));
|
|
|
|
|
inode->i_ctime = timespec_to_timespec64(hfsp_mt2ut(folder->attribute_mod_date));
|
2010-10-01 11:43:31 +08:00
|
|
|
HFSPLUS_I(inode)->create_date = folder->create_date;
|
|
|
|
|
HFSPLUS_I(inode)->fs_blocks = 0;
|
2014-03-11 06:49:51 +08:00
|
|
|
if (folder->flags & cpu_to_be16(HFSPLUS_HAS_FOLDER_COUNT)) {
|
|
|
|
|
HFSPLUS_I(inode)->subfolders =
|
|
|
|
|
be32_to_cpu(folder->subfolders);
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_op = &hfsplus_dir_inode_operations;
|
|
|
|
|
inode->i_fop = &hfsplus_dir_operations;
|
|
|
|
|
} else if (type == HFSPLUS_FILE) {
|
|
|
|
|
struct hfsplus_cat_file *file = &entry.file;
|
|
|
|
|
|
|
|
|
|
if (fd->entrylength < sizeof(struct hfsplus_cat_file))
|
|
|
|
|
/* panic? */;
|
|
|
|
|
hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_file));
|
|
|
|
|
|
2010-11-23 21:38:13 +08:00
|
|
|
hfsplus_inode_read_fork(inode, HFSPLUS_IS_RSRC(inode) ?
|
|
|
|
|
&file->rsrc_fork : &file->data_fork);
|
2005-04-17 06:20:36 +08:00
|
|
|
hfsplus_get_perms(inode, &file->permissions, 0);
|
2011-10-28 20:13:29 +08:00
|
|
|
set_nlink(inode, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (S_ISREG(inode->i_mode)) {
|
|
|
|
|
if (file->permissions.dev)
|
2011-10-28 20:13:29 +08:00
|
|
|
set_nlink(inode,
|
|
|
|
|
be32_to_cpu(file->permissions.dev));
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_op = &hfsplus_file_inode_operations;
|
|
|
|
|
inode->i_fop = &hfsplus_file_operations;
|
|
|
|
|
inode->i_mapping->a_ops = &hfsplus_aops;
|
|
|
|
|
} else if (S_ISLNK(inode->i_mode)) {
|
|
|
|
|
inode->i_op = &page_symlink_inode_operations;
|
2015-11-17 14:07:57 +08:00
|
|
|
inode_nohighmem(inode);
|
2005-04-17 06:20:36 +08:00
|
|
|
inode->i_mapping->a_ops = &hfsplus_aops;
|
|
|
|
|
} else {
|
|
|
|
|
init_special_inode(inode, inode->i_mode,
|
|
|
|
|
be32_to_cpu(file->permissions.dev));
|
|
|
|
|
}
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 10:36:02 +08:00
|
|
|
inode->i_atime = timespec_to_timespec64(hfsp_mt2ut(file->access_date));
|
|
|
|
|
inode->i_mtime = timespec_to_timespec64(hfsp_mt2ut(file->content_mod_date));
|
|
|
|
|
inode->i_ctime = timespec_to_timespec64(hfsp_mt2ut(file->attribute_mod_date));
|
2010-10-01 11:43:31 +08:00
|
|
|
HFSPLUS_I(inode)->create_date = file->create_date;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2013-05-01 06:27:55 +08:00
|
|
|
pr_err("bad catalog entry used to create inode\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
res = -EIO;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int hfsplus_cat_write_inode(struct inode *inode)
|
|
|
|
|
{
|
|
|
|
|
struct inode *main_inode = inode;
|
|
|
|
|
struct hfs_find_data fd;
|
|
|
|
|
hfsplus_cat_entry entry;
|
|
|
|
|
|
|
|
|
|
if (HFSPLUS_IS_RSRC(inode))
|
2010-10-01 11:43:31 +08:00
|
|
|
main_inode = HFSPLUS_I(inode)->rsrc_inode;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
if (!main_inode->i_nlink)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2010-10-01 11:42:59 +08:00
|
|
|
if (hfs_find_init(HFSPLUS_SB(main_inode->i_sb)->cat_tree, &fd))
|
2005-04-17 06:20:36 +08:00
|
|
|
/* panic? */
|
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
|
|
if (hfsplus_find_cat(main_inode->i_sb, main_inode->i_ino, &fd))
|
|
|
|
|
/* panic? */
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
if (S_ISDIR(main_inode->i_mode)) {
|
|
|
|
|
struct hfsplus_cat_folder *folder = &entry.folder;
|
|
|
|
|
|
|
|
|
|
if (fd.entrylength < sizeof(struct hfsplus_cat_folder))
|
|
|
|
|
/* panic? */;
|
|
|
|
|
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_folder));
|
|
|
|
|
/* simple node checks? */
|
2010-10-14 21:54:39 +08:00
|
|
|
hfsplus_cat_set_perms(inode, &folder->permissions);
|
2005-04-17 06:20:36 +08:00
|
|
|
folder->access_date = hfsp_ut2mt(inode->i_atime);
|
|
|
|
|
folder->content_mod_date = hfsp_ut2mt(inode->i_mtime);
|
|
|
|
|
folder->attribute_mod_date = hfsp_ut2mt(inode->i_ctime);
|
|
|
|
|
folder->valence = cpu_to_be32(inode->i_size - 2);
|
2014-03-11 06:49:51 +08:00
|
|
|
if (folder->flags & cpu_to_be16(HFSPLUS_HAS_FOLDER_COUNT)) {
|
|
|
|
|
folder->subfolders =
|
|
|
|
|
cpu_to_be32(HFSPLUS_I(inode)->subfolders);
|
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
hfs_bnode_write(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_folder));
|
|
|
|
|
} else if (HFSPLUS_IS_RSRC(inode)) {
|
|
|
|
|
struct hfsplus_cat_file *file = &entry.file;
|
|
|
|
|
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_file));
|
|
|
|
|
hfsplus_inode_write_fork(inode, &file->rsrc_fork);
|
|
|
|
|
hfs_bnode_write(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_file));
|
|
|
|
|
} else {
|
|
|
|
|
struct hfsplus_cat_file *file = &entry.file;
|
|
|
|
|
|
|
|
|
|
if (fd.entrylength < sizeof(struct hfsplus_cat_file))
|
|
|
|
|
/* panic? */;
|
|
|
|
|
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_file));
|
|
|
|
|
hfsplus_inode_write_fork(inode, &file->data_fork);
|
2010-10-14 21:54:39 +08:00
|
|
|
hfsplus_cat_set_perms(inode, &file->permissions);
|
2010-12-17 00:08:38 +08:00
|
|
|
if (HFSPLUS_FLG_IMMUTABLE &
|
|
|
|
|
(file->permissions.rootflags |
|
|
|
|
|
file->permissions.userflags))
|
2005-04-17 06:20:36 +08:00
|
|
|
file->flags |= cpu_to_be16(HFSPLUS_FILE_LOCKED);
|
|
|
|
|
else
|
|
|
|
|
file->flags &= cpu_to_be16(~HFSPLUS_FILE_LOCKED);
|
|
|
|
|
file->access_date = hfsp_ut2mt(inode->i_atime);
|
|
|
|
|
file->content_mod_date = hfsp_ut2mt(inode->i_mtime);
|
|
|
|
|
file->attribute_mod_date = hfsp_ut2mt(inode->i_ctime);
|
|
|
|
|
hfs_bnode_write(fd.bnode, &entry, fd.entryoffset,
|
|
|
|
|
sizeof(struct hfsplus_cat_file));
|
|
|
|
|
}
|
2010-11-23 21:38:15 +08:00
|
|
|
|
|
|
|
|
set_bit(HFSPLUS_I_CAT_DIRTY, &HFSPLUS_I(inode)->flags);
|
2005-04-17 06:20:36 +08:00
|
|
|
out:
|
|
|
|
|
hfs_find_exit(&fd);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|