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
|
2010-04-07 06:14:15 +08:00
|
|
|
#include <linux/ceph/ceph_debug.h>
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2010-04-07 06:14:15 +08:00
|
|
|
#include <linux/module.h>
|
2009-10-07 02:31:08 +08:00
|
|
|
#include <linux/sched.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2009-10-07 02:31:08 +08:00
|
|
|
#include <linux/file.h>
|
2012-08-01 02:27:36 +08:00
|
|
|
#include <linux/mount.h>
|
2009-10-07 02:31:08 +08:00
|
|
|
#include <linux/namei.h>
|
|
|
|
#include <linux/writeback.h>
|
2013-08-15 11:51:44 +08:00
|
|
|
#include <linux/falloc.h>
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
#include "super.h"
|
|
|
|
#include "mds_client.h"
|
2013-08-22 05:29:54 +08:00
|
|
|
#include "cache.h"
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2017-04-28 00:34:00 +08:00
|
|
|
static __le32 ceph_flags_sys2wire(u32 flags)
|
|
|
|
{
|
|
|
|
u32 wire_flags = 0;
|
|
|
|
|
|
|
|
switch (flags & O_ACCMODE) {
|
|
|
|
case O_RDONLY:
|
|
|
|
wire_flags |= CEPH_O_RDONLY;
|
|
|
|
break;
|
|
|
|
case O_WRONLY:
|
|
|
|
wire_flags |= CEPH_O_WRONLY;
|
|
|
|
break;
|
|
|
|
case O_RDWR:
|
|
|
|
wire_flags |= CEPH_O_RDWR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2018-03-09 15:12:40 +08:00
|
|
|
flags &= ~O_ACCMODE;
|
|
|
|
|
2017-04-28 00:34:00 +08:00
|
|
|
#define ceph_sys2wire(a) if (flags & a) { wire_flags |= CEPH_##a; flags &= ~a; }
|
|
|
|
|
|
|
|
ceph_sys2wire(O_CREAT);
|
|
|
|
ceph_sys2wire(O_EXCL);
|
|
|
|
ceph_sys2wire(O_TRUNC);
|
|
|
|
ceph_sys2wire(O_DIRECTORY);
|
|
|
|
ceph_sys2wire(O_NOFOLLOW);
|
|
|
|
|
|
|
|
#undef ceph_sys2wire
|
|
|
|
|
|
|
|
if (flags)
|
2018-01-30 16:29:17 +08:00
|
|
|
dout("unused open flags: %x\n", flags);
|
2017-04-28 00:34:00 +08:00
|
|
|
|
|
|
|
return cpu_to_le32(wire_flags);
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
/*
|
|
|
|
* Ceph file operations
|
|
|
|
*
|
|
|
|
* Implement basic open/close functionality, and implement
|
|
|
|
* read/write.
|
|
|
|
*
|
|
|
|
* We implement three modes of file I/O:
|
|
|
|
* - buffered uses the generic_file_aio_{read,write} helpers
|
|
|
|
*
|
|
|
|
* - synchronous is used when there is multi-client read/write
|
|
|
|
* sharing, avoids the page cache, and synchronously waits for an
|
|
|
|
* ack from the OSD.
|
|
|
|
*
|
|
|
|
* - direct io takes the variant of the sync path that references
|
|
|
|
* user pages directly.
|
|
|
|
*
|
|
|
|
* fsync() flushes and waits on dirty pages, but just queues metadata
|
|
|
|
* for writeback: since the MDS can recover size and mtime there is no
|
|
|
|
* need to wait for MDS acknowledgement.
|
|
|
|
*/
|
|
|
|
|
2015-10-08 15:26:15 +08:00
|
|
|
/*
|
2018-05-04 22:57:31 +08:00
|
|
|
* How many pages to get in one call to iov_iter_get_pages(). This
|
|
|
|
* determines the size of the on-stack array used as a buffer.
|
2015-10-08 15:26:15 +08:00
|
|
|
*/
|
2018-05-04 22:57:31 +08:00
|
|
|
#define ITER_GET_BVECS_PAGES 64
|
|
|
|
|
|
|
|
static ssize_t __iter_get_bvecs(struct iov_iter *iter, size_t maxsize,
|
|
|
|
struct bio_vec *bvecs)
|
2015-10-08 15:26:15 +08:00
|
|
|
{
|
2018-05-04 22:57:31 +08:00
|
|
|
size_t size = 0;
|
|
|
|
int bvec_idx = 0;
|
|
|
|
|
|
|
|
if (maxsize > iov_iter_count(iter))
|
|
|
|
maxsize = iov_iter_count(iter);
|
|
|
|
|
|
|
|
while (size < maxsize) {
|
|
|
|
struct page *pages[ITER_GET_BVECS_PAGES];
|
|
|
|
ssize_t bytes;
|
|
|
|
size_t start;
|
|
|
|
int idx = 0;
|
|
|
|
|
|
|
|
bytes = iov_iter_get_pages(iter, pages, maxsize - size,
|
|
|
|
ITER_GET_BVECS_PAGES, &start);
|
|
|
|
if (bytes < 0)
|
|
|
|
return size ?: bytes;
|
|
|
|
|
|
|
|
iov_iter_advance(iter, bytes);
|
|
|
|
size += bytes;
|
|
|
|
|
|
|
|
for ( ; bytes; idx++, bvec_idx++) {
|
|
|
|
struct bio_vec bv = {
|
|
|
|
.bv_page = pages[idx],
|
|
|
|
.bv_len = min_t(int, bytes, PAGE_SIZE - start),
|
|
|
|
.bv_offset = start,
|
|
|
|
};
|
|
|
|
|
|
|
|
bvecs[bvec_idx] = bv;
|
|
|
|
bytes -= bv.bv_len;
|
|
|
|
start = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return size;
|
2015-10-08 15:26:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2018-05-04 22:57:31 +08:00
|
|
|
* iov_iter_get_pages() only considers one iov_iter segment, no matter
|
|
|
|
* what maxsize or maxpages are given. For ITER_BVEC that is a single
|
|
|
|
* page.
|
|
|
|
*
|
|
|
|
* Attempt to get up to @maxsize bytes worth of pages from @iter.
|
|
|
|
* Return the number of bytes in the created bio_vec array, or an error.
|
2015-10-08 15:26:15 +08:00
|
|
|
*/
|
2018-05-04 22:57:31 +08:00
|
|
|
static ssize_t iter_get_bvecs_alloc(struct iov_iter *iter, size_t maxsize,
|
|
|
|
struct bio_vec **bvecs, int *num_bvecs)
|
2015-10-08 15:26:15 +08:00
|
|
|
{
|
2018-05-04 22:57:31 +08:00
|
|
|
struct bio_vec *bv;
|
|
|
|
size_t orig_count = iov_iter_count(iter);
|
|
|
|
ssize_t bytes;
|
|
|
|
int npages;
|
2015-10-08 15:26:15 +08:00
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
iov_iter_truncate(iter, maxsize);
|
|
|
|
npages = iov_iter_npages(iter, INT_MAX);
|
|
|
|
iov_iter_reexpand(iter, orig_count);
|
2015-10-08 15:26:15 +08:00
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
/*
|
|
|
|
* __iter_get_bvecs() may populate only part of the array -- zero it
|
|
|
|
* out.
|
|
|
|
*/
|
|
|
|
bv = kvmalloc_array(npages, sizeof(*bv), GFP_KERNEL | __GFP_ZERO);
|
|
|
|
if (!bv)
|
|
|
|
return -ENOMEM;
|
2015-10-08 15:26:15 +08:00
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
bytes = __iter_get_bvecs(iter, maxsize, bv);
|
|
|
|
if (bytes < 0) {
|
|
|
|
/*
|
|
|
|
* No pages were pinned -- just free the array.
|
|
|
|
*/
|
|
|
|
kvfree(bv);
|
|
|
|
return bytes;
|
2015-10-08 15:26:15 +08:00
|
|
|
}
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
*bvecs = bv;
|
|
|
|
*num_bvecs = npages;
|
|
|
|
return bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void put_bvecs(struct bio_vec *bvecs, int num_bvecs, bool should_dirty)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < num_bvecs; i++) {
|
|
|
|
if (bvecs[i].bv_page) {
|
|
|
|
if (should_dirty)
|
|
|
|
set_page_dirty_lock(bvecs[i].bv_page);
|
|
|
|
put_page(bvecs[i].bv_page);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
kvfree(bvecs);
|
2015-10-08 15:26:15 +08:00
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare an open request. Preallocate ceph_cap to avoid an
|
|
|
|
* inopportune ENOMEM later.
|
|
|
|
*/
|
|
|
|
static struct ceph_mds_request *
|
|
|
|
prepare_open_request(struct super_block *sb, int flags, int create_mode)
|
|
|
|
{
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_sb_to_client(sb);
|
|
|
|
struct ceph_mds_client *mdsc = fsc->mdsc;
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_mds_request *req;
|
|
|
|
int want_auth = USE_ANY_MDS;
|
|
|
|
int op = (flags & O_CREAT) ? CEPH_MDS_OP_CREATE : CEPH_MDS_OP_OPEN;
|
|
|
|
|
|
|
|
if (flags & (O_WRONLY|O_RDWR|O_CREAT|O_TRUNC))
|
|
|
|
want_auth = USE_AUTH_MDS;
|
|
|
|
|
|
|
|
req = ceph_mdsc_create_request(mdsc, op, want_auth);
|
|
|
|
if (IS_ERR(req))
|
|
|
|
goto out;
|
|
|
|
req->r_fmode = ceph_flags_to_mode(flags);
|
2017-04-28 00:34:00 +08:00
|
|
|
req->r_args.open.flags = ceph_flags_sys2wire(flags);
|
2009-10-07 02:31:08 +08:00
|
|
|
req->r_args.open.mode = cpu_to_le32(create_mode);
|
|
|
|
out:
|
|
|
|
return req;
|
|
|
|
}
|
|
|
|
|
2018-03-13 10:42:44 +08:00
|
|
|
static int ceph_init_file_info(struct inode *inode, struct file *file,
|
|
|
|
int fmode, bool isdir)
|
|
|
|
{
|
|
|
|
struct ceph_file_info *fi;
|
|
|
|
|
|
|
|
dout("%s %p %p 0%o (%s)\n", __func__, inode, file,
|
|
|
|
inode->i_mode, isdir ? "dir" : "regular");
|
|
|
|
BUG_ON(inode->i_fop->release != ceph_release);
|
|
|
|
|
|
|
|
if (isdir) {
|
|
|
|
struct ceph_dir_file_info *dfi =
|
|
|
|
kmem_cache_zalloc(ceph_dir_file_cachep, GFP_KERNEL);
|
|
|
|
if (!dfi) {
|
|
|
|
ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->private_data = dfi;
|
|
|
|
fi = &dfi->file_info;
|
|
|
|
dfi->next_offset = 2;
|
|
|
|
dfi->readdir_cache_idx = -1;
|
|
|
|
} else {
|
|
|
|
fi = kmem_cache_zalloc(ceph_file_cachep, GFP_KERNEL);
|
|
|
|
if (!fi) {
|
|
|
|
ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->private_data = fi;
|
|
|
|
}
|
|
|
|
|
|
|
|
fi->fmode = fmode;
|
|
|
|
spin_lock_init(&fi->rw_contexts_lock);
|
|
|
|
INIT_LIST_HEAD(&fi->rw_contexts);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
/*
|
|
|
|
* initialize private struct file data.
|
|
|
|
* if we fail, clean up by dropping fmode reference on the ceph_inode
|
|
|
|
*/
|
|
|
|
static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
switch (inode->i_mode & S_IFMT) {
|
|
|
|
case S_IFREG:
|
2016-05-18 15:25:03 +08:00
|
|
|
ceph_fscache_register_inode_cookie(inode);
|
|
|
|
ceph_fscache_file_set_cookie(inode, file);
|
2009-10-07 02:31:08 +08:00
|
|
|
case S_IFDIR:
|
2018-03-13 10:42:44 +08:00
|
|
|
ret = ceph_init_file_info(inode, file, fmode,
|
|
|
|
S_ISDIR(inode->i_mode));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case S_IFLNK:
|
|
|
|
dout("init_file %p %p 0%o (symlink)\n", inode, file,
|
|
|
|
inode->i_mode);
|
|
|
|
ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
dout("init_file %p %p 0%o (special)\n", inode, file,
|
|
|
|
inode->i_mode);
|
|
|
|
/*
|
|
|
|
* we need to drop the open ref now, since we don't
|
|
|
|
* have .release set to ceph_release.
|
|
|
|
*/
|
|
|
|
ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
|
|
|
|
BUG_ON(inode->i_fop->release == ceph_release);
|
|
|
|
|
|
|
|
/* call the proper open fop */
|
|
|
|
ret = inode->i_fop->open(inode, file);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-04-08 15:27:16 +08:00
|
|
|
/*
|
|
|
|
* try renew caps after session gets killed.
|
|
|
|
*/
|
|
|
|
int ceph_renew_caps(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_mds_request *req;
|
|
|
|
int err, flags, wanted;
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
wanted = __ceph_caps_file_wanted(ci);
|
|
|
|
if (__ceph_is_any_real_caps(ci) &&
|
2017-03-25 17:28:10 +08:00
|
|
|
(!(wanted & CEPH_CAP_ANY_WR) || ci->i_auth_cap)) {
|
2016-04-08 15:27:16 +08:00
|
|
|
int issued = __ceph_caps_issued(ci, NULL);
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
dout("renew caps %p want %s issued %s updating mds_wanted\n",
|
|
|
|
inode, ceph_cap_string(wanted), ceph_cap_string(issued));
|
|
|
|
ceph_check_caps(ci, 0, NULL);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
|
|
|
|
flags = 0;
|
|
|
|
if ((wanted & CEPH_CAP_FILE_RD) && (wanted & CEPH_CAP_FILE_WR))
|
|
|
|
flags = O_RDWR;
|
|
|
|
else if (wanted & CEPH_CAP_FILE_RD)
|
|
|
|
flags = O_RDONLY;
|
|
|
|
else if (wanted & CEPH_CAP_FILE_WR)
|
|
|
|
flags = O_WRONLY;
|
|
|
|
#ifdef O_LAZY
|
|
|
|
if (wanted & CEPH_CAP_FILE_LAZYIO)
|
|
|
|
flags |= O_LAZY;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
req = prepare_open_request(inode->i_sb, flags, 0);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
req->r_inode = inode;
|
|
|
|
ihold(inode);
|
|
|
|
req->r_num_caps = 1;
|
|
|
|
req->r_fmode = -1;
|
|
|
|
|
|
|
|
err = ceph_mdsc_do_request(mdsc, NULL, req);
|
|
|
|
ceph_mdsc_put_request(req);
|
|
|
|
out:
|
|
|
|
dout("renew caps %p open result=%d\n", inode, err);
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
/*
|
|
|
|
* If we already have the requisite capabilities, we can satisfy
|
|
|
|
* the open request locally (no need to request new caps from the
|
|
|
|
* MDS). We do, however, need to inform the MDS (asynchronously)
|
|
|
|
* if our wanted caps set expands.
|
|
|
|
*/
|
|
|
|
int ceph_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_sb_to_client(inode->i_sb);
|
|
|
|
struct ceph_mds_client *mdsc = fsc->mdsc;
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_mds_request *req;
|
2018-02-28 19:43:47 +08:00
|
|
|
struct ceph_file_info *fi = file->private_data;
|
2009-10-07 02:31:08 +08:00
|
|
|
int err;
|
|
|
|
int flags, fmode, wanted;
|
|
|
|
|
2018-02-28 19:43:47 +08:00
|
|
|
if (fi) {
|
2009-10-07 02:31:08 +08:00
|
|
|
dout("open file %p is already opened\n", file);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* filter out O_CREAT|O_EXCL; vfs did that already. yuck. */
|
|
|
|
flags = file->f_flags & ~(O_CREAT|O_EXCL);
|
|
|
|
if (S_ISDIR(inode->i_mode))
|
|
|
|
flags = O_DIRECTORY; /* mds likes to know */
|
|
|
|
|
|
|
|
dout("open inode %p ino %llx.%llx file %p flags %d (%d)\n", inode,
|
|
|
|
ceph_vinop(inode), file, flags, file->f_flags);
|
|
|
|
fmode = ceph_flags_to_mode(flags);
|
|
|
|
wanted = ceph_caps_for_mode(fmode);
|
|
|
|
|
|
|
|
/* snapped files are read-only */
|
|
|
|
if (ceph_snap(inode) != CEPH_NOSNAP && (file->f_mode & FMODE_WRITE))
|
|
|
|
return -EROFS;
|
|
|
|
|
|
|
|
/* trivially open snapdir */
|
|
|
|
if (ceph_snap(inode) == CEPH_SNAPDIR) {
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2009-10-07 02:31:08 +08:00
|
|
|
__ceph_get_fmode(ci, fmode);
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:08 +08:00
|
|
|
return ceph_init_file(inode, file, fmode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-11-08 01:07:15 +08:00
|
|
|
* No need to block if we have caps on the auth MDS (for
|
|
|
|
* write) or any MDS (for read). Update wanted set
|
2009-10-07 02:31:08 +08:00
|
|
|
* asynchronously.
|
|
|
|
*/
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2010-11-08 01:07:15 +08:00
|
|
|
if (__ceph_is_any_real_caps(ci) &&
|
|
|
|
(((fmode & CEPH_FILE_MODE_WR) == 0) || ci->i_auth_cap)) {
|
2017-01-29 22:15:47 +08:00
|
|
|
int mds_wanted = __ceph_caps_mds_wanted(ci, true);
|
2009-10-07 02:31:08 +08:00
|
|
|
int issued = __ceph_caps_issued(ci, NULL);
|
|
|
|
|
|
|
|
dout("open %p fmode %d want %s issued %s using existing\n",
|
|
|
|
inode, fmode, ceph_cap_string(wanted),
|
|
|
|
ceph_cap_string(issued));
|
|
|
|
__ceph_get_fmode(ci, fmode);
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
/* adjust wanted? */
|
|
|
|
if ((issued & wanted) != wanted &&
|
|
|
|
(mds_wanted & wanted) != wanted &&
|
|
|
|
ceph_snap(inode) != CEPH_SNAPDIR)
|
|
|
|
ceph_check_caps(ci, 0, NULL);
|
|
|
|
|
|
|
|
return ceph_init_file(inode, file, fmode);
|
|
|
|
} else if (ceph_snap(inode) != CEPH_NOSNAP &&
|
|
|
|
(ci->i_snap_caps & wanted) == wanted) {
|
|
|
|
__ceph_get_fmode(ci, fmode);
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:08 +08:00
|
|
|
return ceph_init_file(inode, file, fmode);
|
|
|
|
}
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
dout("open fmode %d wants %s\n", fmode, ceph_cap_string(wanted));
|
|
|
|
req = prepare_open_request(inode->i_sb, flags, 0);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
2011-05-28 00:24:26 +08:00
|
|
|
req->r_inode = inode;
|
|
|
|
ihold(inode);
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
req->r_num_caps = 1;
|
2015-08-18 10:25:35 +08:00
|
|
|
err = ceph_mdsc_do_request(mdsc, NULL, req);
|
2009-10-07 02:31:08 +08:00
|
|
|
if (!err)
|
|
|
|
err = ceph_init_file(inode, file, req->r_fmode);
|
|
|
|
ceph_mdsc_put_request(req);
|
|
|
|
dout("open result=%d on %llx.%llx\n", err, ceph_vinop(inode));
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2012-08-01 02:27:36 +08:00
|
|
|
* Do a lookup + open with a single request. If we get a non-existent
|
|
|
|
* file or symlink, return 1 so the VFS can retry.
|
2009-10-07 02:31:08 +08:00
|
|
|
*/
|
2012-08-01 02:27:36 +08:00
|
|
|
int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
|
2012-06-22 16:40:19 +08:00
|
|
|
struct file *file, unsigned flags, umode_t mode,
|
2012-06-22 16:39:14 +08:00
|
|
|
int *opened)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
|
|
|
|
struct ceph_mds_client *mdsc = fsc->mdsc;
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_mds_request *req;
|
2012-08-01 02:27:36 +08:00
|
|
|
struct dentry *dn;
|
2014-09-16 20:35:17 +08:00
|
|
|
struct ceph_acls_info acls = {};
|
2018-01-05 18:47:19 +08:00
|
|
|
int mask;
|
2009-10-07 02:31:08 +08:00
|
|
|
int err;
|
|
|
|
|
2014-10-22 08:11:25 +08:00
|
|
|
dout("atomic_open %p dentry %p '%pd' %s flags %d mode 0%o\n",
|
|
|
|
dir, dentry, dentry,
|
2012-08-01 02:27:36 +08:00
|
|
|
d_unhashed(dentry) ? "unhashed" : "hashed", flags, mode);
|
|
|
|
|
|
|
|
if (dentry->d_name.len > NAME_MAX)
|
|
|
|
return -ENAMETOOLONG;
|
|
|
|
|
2014-09-16 20:35:17 +08:00
|
|
|
if (flags & O_CREAT) {
|
2018-01-05 18:47:19 +08:00
|
|
|
if (ceph_quota_is_max_files_exceeded(dir))
|
|
|
|
return -EDQUOT;
|
2014-09-16 20:35:17 +08:00
|
|
|
err = ceph_pre_init_acls(dir, &mode, &acls);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
/* do the open */
|
|
|
|
req = prepare_open_request(dir->i_sb, flags, mode);
|
2014-09-16 20:35:17 +08:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto out_acl;
|
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
req->r_dentry = dget(dentry);
|
|
|
|
req->r_num_caps = 2;
|
|
|
|
if (flags & O_CREAT) {
|
2017-11-23 17:47:15 +08:00
|
|
|
req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;
|
2009-10-07 02:31:08 +08:00
|
|
|
req->r_dentry_unless = CEPH_CAP_FILE_EXCL;
|
2014-09-16 20:35:17 +08:00
|
|
|
if (acls.pagelist) {
|
|
|
|
req->r_pagelist = acls.pagelist;
|
|
|
|
acls.pagelist = NULL;
|
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
2016-03-07 10:34:50 +08:00
|
|
|
|
|
|
|
mask = CEPH_STAT_CAP_INODE | CEPH_CAP_AUTH_SHARED;
|
|
|
|
if (ceph_security_xattr_wanted(dir))
|
|
|
|
mask |= CEPH_CAP_XATTR_SHARED;
|
|
|
|
req->r_args.open.mask = cpu_to_le32(mask);
|
|
|
|
|
2017-01-31 23:28:26 +08:00
|
|
|
req->r_parent = dir;
|
|
|
|
set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);
|
2011-07-27 02:27:48 +08:00
|
|
|
err = ceph_mdsc_do_request(mdsc,
|
|
|
|
(flags & (O_CREAT|O_TRUNC)) ? dir : NULL,
|
|
|
|
req);
|
2015-01-19 13:23:20 +08:00
|
|
|
err = ceph_handle_snapdir(req, dentry, err);
|
2012-12-20 03:44:23 +08:00
|
|
|
if (err)
|
2014-09-16 20:35:17 +08:00
|
|
|
goto out_req;
|
2012-12-20 03:44:23 +08:00
|
|
|
|
2015-08-18 10:23:50 +08:00
|
|
|
if ((flags & O_CREAT) && !req->r_reply_info.head->is_dentry)
|
2009-10-07 02:31:08 +08:00
|
|
|
err = ceph_handle_notrace_create(dir, dentry);
|
2012-06-05 21:10:25 +08:00
|
|
|
|
2016-07-05 21:44:53 +08:00
|
|
|
if (d_in_lookup(dentry)) {
|
2012-08-01 02:27:36 +08:00
|
|
|
dn = ceph_finish_lookup(req, dentry, err);
|
|
|
|
if (IS_ERR(dn))
|
|
|
|
err = PTR_ERR(dn);
|
|
|
|
} else {
|
|
|
|
/* we were given a hashed negative dentry */
|
|
|
|
dn = NULL;
|
|
|
|
}
|
|
|
|
if (err)
|
2014-09-16 20:35:17 +08:00
|
|
|
goto out_req;
|
2015-03-18 06:25:59 +08:00
|
|
|
if (dn || d_really_is_negative(dentry) || d_is_symlink(dentry)) {
|
2012-08-01 02:27:36 +08:00
|
|
|
/* make vfs retry on splice, ENOENT, or symlink */
|
|
|
|
dout("atomic_open finish_no_open on dn %p\n", dn);
|
|
|
|
err = finish_no_open(file, dn);
|
|
|
|
} else {
|
|
|
|
dout("atomic_open finish_open on dn %p\n", dn);
|
2012-12-29 01:56:46 +08:00
|
|
|
if (req->r_op == CEPH_MDS_OP_CREATE && req->r_reply_info.has_create_ino) {
|
2015-03-18 06:25:59 +08:00
|
|
|
ceph_init_inode_acls(d_inode(dentry), &acls);
|
2012-12-29 01:56:46 +08:00
|
|
|
*opened |= FILE_CREATED;
|
|
|
|
}
|
2012-08-01 02:27:36 +08:00
|
|
|
err = finish_open(file, dentry, ceph_open, opened);
|
|
|
|
}
|
2014-09-16 20:35:17 +08:00
|
|
|
out_req:
|
2014-04-01 20:20:17 +08:00
|
|
|
if (!req->r_err && req->r_target_inode)
|
|
|
|
ceph_put_fmode(ceph_inode(req->r_target_inode), req->r_fmode);
|
2012-08-01 02:27:36 +08:00
|
|
|
ceph_mdsc_put_request(req);
|
2014-09-16 20:35:17 +08:00
|
|
|
out_acl:
|
|
|
|
ceph_release_acls_info(&acls);
|
2012-08-01 02:27:36 +08:00
|
|
|
dout("atomic_open result=%d\n", err);
|
2012-06-22 16:39:14 +08:00
|
|
|
return err;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int ceph_release(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
|
2018-03-13 10:42:44 +08:00
|
|
|
if (S_ISDIR(inode->i_mode)) {
|
|
|
|
struct ceph_dir_file_info *dfi = file->private_data;
|
|
|
|
dout("release inode %p dir file %p\n", inode, file);
|
|
|
|
WARN_ON(!list_empty(&dfi->file_info.rw_contexts));
|
|
|
|
|
|
|
|
ceph_put_fmode(ci, dfi->file_info.fmode);
|
|
|
|
|
|
|
|
if (dfi->last_readdir)
|
|
|
|
ceph_mdsc_put_request(dfi->last_readdir);
|
|
|
|
kfree(dfi->last_name);
|
|
|
|
kfree(dfi->dir_info);
|
|
|
|
kmem_cache_free(ceph_dir_file_cachep, dfi);
|
|
|
|
} else {
|
|
|
|
struct ceph_file_info *fi = file->private_data;
|
|
|
|
dout("release inode %p regular file %p\n", inode, file);
|
|
|
|
WARN_ON(!list_empty(&fi->rw_contexts));
|
|
|
|
|
|
|
|
ceph_put_fmode(ci, fi->fmode);
|
|
|
|
kmem_cache_free(ceph_file_cachep, fi);
|
|
|
|
}
|
2010-03-02 01:57:54 +08:00
|
|
|
|
|
|
|
/* wake up anyone waiting for caps on this inode */
|
2010-07-28 04:11:08 +08:00
|
|
|
wake_up_all(&ci->i_cap_wq);
|
2009-10-07 02:31:08 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
enum {
|
2015-12-23 21:23:38 +08:00
|
|
|
HAVE_RETRIED = 1,
|
|
|
|
CHECK_EOF = 2,
|
|
|
|
READ_INLINE = 3,
|
2014-11-14 22:36:18 +08:00
|
|
|
};
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
/*
|
|
|
|
* Read a range of bytes striped over one or more objects. Iterate over
|
|
|
|
* objects we stripe over. (That's not atomic, but good enough for now.)
|
|
|
|
*
|
|
|
|
* If we get a short result from the OSD, check against i_size; we need to
|
|
|
|
* only return a short read to the caller if we hit EOF.
|
|
|
|
*/
|
|
|
|
static int striped_read(struct inode *inode,
|
2016-11-08 21:54:34 +08:00
|
|
|
u64 pos, u64 len,
|
2010-02-10 06:04:02 +08:00
|
|
|
struct page **pages, int num_pages,
|
2016-11-08 21:54:34 +08:00
|
|
|
int page_align, int *checkeof)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2016-11-08 21:54:34 +08:00
|
|
|
u64 this_len;
|
2015-12-30 11:32:46 +08:00
|
|
|
loff_t i_size;
|
2016-11-08 21:54:34 +08:00
|
|
|
int page_idx;
|
|
|
|
int ret, read = 0;
|
2009-10-07 02:31:08 +08:00
|
|
|
bool hit_stripe, was_short;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we may need to do multiple reads. not atomic, unfortunately.
|
|
|
|
*/
|
|
|
|
more:
|
2016-11-08 21:54:34 +08:00
|
|
|
this_len = len;
|
|
|
|
page_idx = (page_align + read) >> PAGE_SHIFT;
|
2010-04-07 06:14:15 +08:00
|
|
|
ret = ceph_osdc_readpages(&fsc->client->osdc, ceph_vino(inode),
|
2009-10-07 02:31:08 +08:00
|
|
|
&ci->i_layout, pos, &this_len,
|
2016-11-08 21:54:34 +08:00
|
|
|
ci->i_truncate_seq, ci->i_truncate_size,
|
|
|
|
pages + page_idx, num_pages - page_idx,
|
|
|
|
((page_align + read) & ~PAGE_MASK));
|
2009-10-07 02:31:08 +08:00
|
|
|
if (ret == -ENOENT)
|
|
|
|
ret = 0;
|
2016-11-08 21:54:34 +08:00
|
|
|
hit_stripe = this_len < len;
|
2011-06-08 11:40:35 +08:00
|
|
|
was_short = ret >= 0 && ret < this_len;
|
2016-11-08 21:54:34 +08:00
|
|
|
dout("striped_read %llu~%llu (read %u) got %d%s%s\n", pos, len, read,
|
2009-10-07 02:31:08 +08:00
|
|
|
ret, hit_stripe ? " HITSTRIPE" : "", was_short ? " SHORT" : "");
|
|
|
|
|
2015-12-30 11:32:46 +08:00
|
|
|
i_size = i_size_read(inode);
|
2013-08-06 16:20:38 +08:00
|
|
|
if (ret >= 0) {
|
2015-12-30 11:32:46 +08:00
|
|
|
if (was_short && (pos + ret < i_size)) {
|
|
|
|
int zlen = min(this_len - ret, i_size - pos - ret);
|
2016-11-08 21:54:34 +08:00
|
|
|
int zoff = page_align + read + ret;
|
2013-08-06 16:20:38 +08:00
|
|
|
dout(" zero gap %llu to %llu\n",
|
2016-11-08 21:54:34 +08:00
|
|
|
pos + ret, pos + ret + zlen);
|
ceph: properly zero data pages for file holes.
A bug is found in striped_read() of fs/ceph/file.c. striped_read() calls
ceph_zero_pape_vector_range(). The first argument, page_align + read + ret,
passed to ceph_zero_pape_vector_range() is wrong.
When a file has holes, this wrong parameter may cause memory corruption
either in kernal space or user space. Kernel space memory may be corrupted in
the case of non direct IO; user space memory may be corrupted in the case of
direct IO. In the latter case, the application doing direct IO may crash due
to memory corruption, as we have experienced.
The correct value should be initial_align + read + ret, where intial_align =
o_direct ? buf_align : io_align. Compared with page_align, the current page
offest, initial_align is the initial page offest, which should be used to
calculate the page and offset in ceph_zero_pape_vector_range().
Reported-by: caifeng zhu <zhucaifeng@unissoft-nj.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-01-06 15:29:14 +08:00
|
|
|
ceph_zero_page_vector_range(zoff, zlen, pages);
|
|
|
|
ret += zlen;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
2013-08-06 16:20:38 +08:00
|
|
|
|
2016-11-08 21:54:34 +08:00
|
|
|
read += ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
pos += ret;
|
2016-11-08 21:54:34 +08:00
|
|
|
len -= ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-08-06 16:20:38 +08:00
|
|
|
/* hit stripe and need continue*/
|
2016-11-08 21:54:34 +08:00
|
|
|
if (len && hit_stripe && pos < i_size)
|
2009-10-07 02:31:08 +08:00
|
|
|
goto more;
|
|
|
|
}
|
|
|
|
|
2013-08-21 15:02:51 +08:00
|
|
|
if (read > 0) {
|
2013-08-06 16:20:38 +08:00
|
|
|
ret = read;
|
2011-06-02 07:08:44 +08:00
|
|
|
/* did we bounce off eof? */
|
2016-11-08 21:54:34 +08:00
|
|
|
if (pos + len > i_size)
|
2014-11-14 22:36:18 +08:00
|
|
|
*checkeof = CHECK_EOF;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
dout("striped_read returns %d\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Completely synchronous read and write methods. Direct from __user
|
|
|
|
* buffer to osd, or directly to user pages (if O_DIRECT).
|
|
|
|
*
|
|
|
|
* If the read spans object boundary, just do multiple reads.
|
|
|
|
*/
|
2016-11-08 21:54:34 +08:00
|
|
|
static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,
|
|
|
|
int *checkeof)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
2013-09-26 14:42:17 +08:00
|
|
|
struct file *file = iocb->ki_filp;
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2009-10-07 02:31:08 +08:00
|
|
|
struct page **pages;
|
2013-09-26 14:42:17 +08:00
|
|
|
u64 off = iocb->ki_pos;
|
2016-11-08 21:54:34 +08:00
|
|
|
int num_pages;
|
|
|
|
ssize_t ret;
|
|
|
|
size_t len = iov_iter_count(to);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2017-08-16 17:24:58 +08:00
|
|
|
dout("sync_read on file %p %llu~%u %s\n", file, off, (unsigned)len,
|
2009-10-07 02:31:08 +08:00
|
|
|
(file->f_flags & O_DIRECT) ? "O_DIRECT" : "");
|
2014-07-21 10:15:48 +08:00
|
|
|
|
|
|
|
if (!len)
|
|
|
|
return 0;
|
2010-11-10 04:24:53 +08:00
|
|
|
/*
|
|
|
|
* flush any page cache pages in this range. this
|
|
|
|
* will make concurrent normal and sync io slow,
|
|
|
|
* but it will at least behave sensibly when they are
|
|
|
|
* in sequence.
|
|
|
|
*/
|
2013-09-26 14:42:17 +08:00
|
|
|
ret = filemap_write_and_wait_range(inode->i_mapping, off,
|
|
|
|
off + len);
|
2010-02-10 03:14:41 +08:00
|
|
|
if (ret < 0)
|
2013-09-26 14:42:17 +08:00
|
|
|
return ret;
|
2010-02-10 03:14:41 +08:00
|
|
|
|
2016-11-08 21:54:34 +08:00
|
|
|
if (unlikely(to->type & ITER_PIPE)) {
|
|
|
|
size_t page_off;
|
|
|
|
ret = iov_iter_get_pages_alloc(to, &pages, len,
|
|
|
|
&page_off);
|
|
|
|
if (ret <= 0)
|
|
|
|
return -ENOMEM;
|
|
|
|
num_pages = DIV_ROUND_UP(ret + page_off, PAGE_SIZE);
|
|
|
|
|
|
|
|
ret = striped_read(inode, off, ret, pages, num_pages,
|
|
|
|
page_off, checkeof);
|
|
|
|
if (ret > 0) {
|
|
|
|
iov_iter_advance(to, ret);
|
|
|
|
off += ret;
|
|
|
|
} else {
|
|
|
|
iov_iter_advance(to, 0);
|
|
|
|
}
|
|
|
|
ceph_put_page_vector(pages, num_pages, false);
|
|
|
|
} else {
|
|
|
|
num_pages = calc_pages_for(off, len);
|
|
|
|
pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);
|
|
|
|
if (IS_ERR(pages))
|
|
|
|
return PTR_ERR(pages);
|
|
|
|
|
|
|
|
ret = striped_read(inode, off, len, pages, num_pages,
|
|
|
|
(off & ~PAGE_MASK), checkeof);
|
|
|
|
if (ret > 0) {
|
|
|
|
int l, k = 0;
|
|
|
|
size_t left = ret;
|
|
|
|
|
|
|
|
while (left) {
|
|
|
|
size_t page_off = off & ~PAGE_MASK;
|
|
|
|
size_t copy = min_t(size_t, left,
|
|
|
|
PAGE_SIZE - page_off);
|
|
|
|
l = copy_page_to_iter(pages[k++], page_off,
|
|
|
|
copy, to);
|
|
|
|
off += l;
|
|
|
|
left -= l;
|
|
|
|
if (l < copy)
|
|
|
|
break;
|
|
|
|
}
|
2013-09-26 14:42:17 +08:00
|
|
|
}
|
2016-11-08 21:54:34 +08:00
|
|
|
ceph_release_page_vector(pages, num_pages);
|
2013-09-26 14:42:17 +08:00
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-09-26 14:42:17 +08:00
|
|
|
if (off > iocb->ki_pos) {
|
|
|
|
ret = off - iocb->ki_pos;
|
|
|
|
iocb->ki_pos = off;
|
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2016-11-08 21:54:34 +08:00
|
|
|
dout("sync_read result %zd\n", ret);
|
2009-10-07 02:31:08 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
struct ceph_aio_request {
|
|
|
|
struct kiocb *iocb;
|
|
|
|
size_t total_len;
|
2018-03-16 11:22:29 +08:00
|
|
|
bool write;
|
|
|
|
bool should_dirty;
|
2015-12-23 21:23:38 +08:00
|
|
|
int error;
|
|
|
|
struct list_head osd_reqs;
|
|
|
|
unsigned num_reqs;
|
|
|
|
atomic_t pending_reqs;
|
2015-12-24 08:44:20 +08:00
|
|
|
struct timespec mtime;
|
2015-12-23 21:23:38 +08:00
|
|
|
struct ceph_cap_flush *prealloc_cf;
|
|
|
|
};
|
|
|
|
|
2015-12-24 08:44:20 +08:00
|
|
|
struct ceph_aio_work {
|
|
|
|
struct work_struct work;
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void ceph_aio_retry_work(struct work_struct *work);
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
static void ceph_aio_complete(struct inode *inode,
|
|
|
|
struct ceph_aio_request *aio_req)
|
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!atomic_dec_and_test(&aio_req->pending_reqs))
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret = aio_req->error;
|
|
|
|
if (!ret)
|
|
|
|
ret = aio_req->total_len;
|
|
|
|
|
|
|
|
dout("ceph_aio_complete %p rc %d\n", inode, ret);
|
|
|
|
|
|
|
|
if (ret >= 0 && aio_req->write) {
|
|
|
|
int dirty;
|
|
|
|
|
|
|
|
loff_t endoff = aio_req->iocb->ki_pos + aio_req->total_len;
|
|
|
|
if (endoff > i_size_read(inode)) {
|
|
|
|
if (ceph_inode_set_size(inode, endoff))
|
|
|
|
ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
ci->i_inline_version = CEPH_INLINE_NONE;
|
|
|
|
dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
|
|
|
|
&aio_req->prealloc_cf);
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
if (dirty)
|
|
|
|
__mark_inode_dirty(inode, dirty);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
ceph_put_cap_refs(ci, (aio_req->write ? CEPH_CAP_FILE_WR :
|
|
|
|
CEPH_CAP_FILE_RD));
|
|
|
|
|
|
|
|
aio_req->iocb->ki_complete(aio_req->iocb, ret, 0);
|
|
|
|
|
|
|
|
ceph_free_cap_flush(aio_req->prealloc_cf);
|
|
|
|
kfree(aio_req);
|
|
|
|
}
|
|
|
|
|
2016-04-28 22:07:24 +08:00
|
|
|
static void ceph_aio_complete_req(struct ceph_osd_request *req)
|
2015-12-23 21:23:38 +08:00
|
|
|
{
|
|
|
|
int rc = req->r_result;
|
|
|
|
struct inode *inode = req->r_inode;
|
|
|
|
struct ceph_aio_request *aio_req = req->r_priv;
|
|
|
|
struct ceph_osd_data *osd_data = osd_req_op_extent_osd_data(req, 0);
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_BVECS);
|
|
|
|
BUG_ON(!osd_data->num_bvecs);
|
|
|
|
|
|
|
|
dout("ceph_aio_complete_req %p rc %d bytes %u\n",
|
|
|
|
inode, rc, osd_data->bvec_pos.iter.bi_size);
|
2015-12-23 21:23:38 +08:00
|
|
|
|
|
|
|
if (rc == -EOLDSNAPC) {
|
2015-12-24 08:44:20 +08:00
|
|
|
struct ceph_aio_work *aio_work;
|
|
|
|
BUG_ON(!aio_req->write);
|
|
|
|
|
|
|
|
aio_work = kmalloc(sizeof(*aio_work), GFP_NOFS);
|
|
|
|
if (aio_work) {
|
|
|
|
INIT_WORK(&aio_work->work, ceph_aio_retry_work);
|
|
|
|
aio_work->req = req;
|
|
|
|
queue_work(ceph_inode_to_client(inode)->wb_wq,
|
|
|
|
&aio_work->work);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
rc = -ENOMEM;
|
|
|
|
} else if (!aio_req->write) {
|
2015-12-23 21:23:38 +08:00
|
|
|
if (rc == -ENOENT)
|
|
|
|
rc = 0;
|
2018-05-04 22:57:31 +08:00
|
|
|
if (rc >= 0 && osd_data->bvec_pos.iter.bi_size > rc) {
|
|
|
|
struct iov_iter i;
|
|
|
|
int zlen = osd_data->bvec_pos.iter.bi_size - rc;
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
/*
|
|
|
|
* If read is satisfied by single OSD request,
|
|
|
|
* it can pass EOF. Otherwise read is within
|
|
|
|
* i_size.
|
|
|
|
*/
|
|
|
|
if (aio_req->num_reqs == 1) {
|
|
|
|
loff_t i_size = i_size_read(inode);
|
|
|
|
loff_t endoff = aio_req->iocb->ki_pos + rc;
|
|
|
|
if (endoff < i_size)
|
|
|
|
zlen = min_t(size_t, zlen,
|
|
|
|
i_size - endoff);
|
|
|
|
aio_req->total_len = rc + zlen;
|
|
|
|
}
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
iov_iter_bvec(&i, ITER_BVEC, osd_data->bvec_pos.bvecs,
|
|
|
|
osd_data->num_bvecs,
|
|
|
|
osd_data->bvec_pos.iter.bi_size);
|
|
|
|
iov_iter_advance(&i, rc);
|
|
|
|
iov_iter_zero(zlen, &i);
|
2015-12-23 21:23:38 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
put_bvecs(osd_data->bvec_pos.bvecs, osd_data->num_bvecs,
|
|
|
|
aio_req->should_dirty);
|
2015-12-23 21:23:38 +08:00
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
|
|
|
|
if (rc < 0)
|
|
|
|
cmpxchg(&aio_req->error, 0, rc);
|
|
|
|
|
|
|
|
ceph_aio_complete(inode, aio_req);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-12-24 08:44:20 +08:00
|
|
|
static void ceph_aio_retry_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct ceph_aio_work *aio_work =
|
|
|
|
container_of(work, struct ceph_aio_work, work);
|
|
|
|
struct ceph_osd_request *orig_req = aio_work->req;
|
|
|
|
struct ceph_aio_request *aio_req = orig_req->r_priv;
|
|
|
|
struct inode *inode = orig_req->r_inode;
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_snap_context *snapc;
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
if (__ceph_have_pending_cap_snap(ci)) {
|
|
|
|
struct ceph_cap_snap *capsnap =
|
|
|
|
list_last_entry(&ci->i_cap_snaps,
|
|
|
|
struct ceph_cap_snap,
|
|
|
|
ci_item);
|
|
|
|
snapc = ceph_get_snap_context(capsnap->context);
|
|
|
|
} else {
|
|
|
|
BUG_ON(!ci->i_head_snapc);
|
|
|
|
snapc = ceph_get_snap_context(ci->i_head_snapc);
|
|
|
|
}
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
|
|
|
|
req = ceph_osdc_alloc_request(orig_req->r_osdc, snapc, 2,
|
|
|
|
false, GFP_NOFS);
|
2016-01-26 17:24:44 +08:00
|
|
|
if (!req) {
|
|
|
|
ret = -ENOMEM;
|
2015-12-24 08:44:20 +08:00
|
|
|
req = orig_req;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2017-08-16 17:27:05 +08:00
|
|
|
req->r_flags = /* CEPH_OSD_FLAG_ORDERSNAP | */ CEPH_OSD_FLAG_WRITE;
|
2016-04-28 22:07:23 +08:00
|
|
|
ceph_oloc_copy(&req->r_base_oloc, &orig_req->r_base_oloc);
|
2016-04-30 01:54:20 +08:00
|
|
|
ceph_oid_copy(&req->r_base_oid, &orig_req->r_base_oid);
|
2015-12-24 08:44:20 +08:00
|
|
|
|
2016-04-27 20:15:51 +08:00
|
|
|
ret = ceph_osdc_alloc_messages(req, GFP_NOFS);
|
|
|
|
if (ret) {
|
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
req = orig_req;
|
|
|
|
goto out;
|
|
|
|
}
|
2015-12-24 08:44:20 +08:00
|
|
|
|
|
|
|
req->r_ops[0] = orig_req->r_ops[0];
|
|
|
|
|
2016-05-26 06:29:52 +08:00
|
|
|
req->r_mtime = aio_req->mtime;
|
|
|
|
req->r_data_offset = req->r_ops[0].extent.offset;
|
2015-12-24 08:44:20 +08:00
|
|
|
|
|
|
|
ceph_osdc_put_request(orig_req);
|
|
|
|
|
|
|
|
req->r_callback = ceph_aio_complete_req;
|
|
|
|
req->r_inode = inode;
|
|
|
|
req->r_priv = aio_req;
|
|
|
|
|
|
|
|
ret = ceph_osdc_start_request(req->r_osdc, req, false);
|
|
|
|
out:
|
|
|
|
if (ret < 0) {
|
|
|
|
req->r_result = ret;
|
2016-04-28 22:07:24 +08:00
|
|
|
ceph_aio_complete_req(req);
|
2015-12-24 08:44:20 +08:00
|
|
|
}
|
|
|
|
|
2016-01-26 23:05:37 +08:00
|
|
|
ceph_put_snap_context(snapc);
|
2015-12-24 08:44:20 +08:00
|
|
|
kfree(aio_work);
|
|
|
|
}
|
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
static ssize_t
|
2015-12-23 21:23:38 +08:00
|
|
|
ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
|
|
|
|
struct ceph_snap_context *snapc,
|
|
|
|
struct ceph_cap_flush **pcf)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
2013-09-12 13:54:26 +08:00
|
|
|
struct file *file = iocb->ki_filp;
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2013-03-15 03:09:05 +08:00
|
|
|
struct ceph_vino vino;
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_osd_request *req;
|
2018-05-04 22:57:31 +08:00
|
|
|
struct bio_vec *bvecs;
|
2015-12-23 21:23:38 +08:00
|
|
|
struct ceph_aio_request *aio_req = NULL;
|
|
|
|
int num_pages = 0;
|
2009-10-07 02:31:08 +08:00
|
|
|
int flags;
|
|
|
|
int ret;
|
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
|
|
|
struct timespec mtime = timespec64_to_timespec(current_time(inode));
|
2015-12-23 21:23:38 +08:00
|
|
|
size_t count = iov_iter_count(iter);
|
|
|
|
loff_t pos = iocb->ki_pos;
|
|
|
|
bool write = iov_iter_rw(iter) == WRITE;
|
2018-03-16 11:22:29 +08:00
|
|
|
bool should_dirty = !write && iter_is_iovec(iter);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (write && ceph_snap(file_inode(file)) != CEPH_NOSNAP)
|
2009-10-07 02:31:08 +08:00
|
|
|
return -EROFS;
|
|
|
|
|
2017-08-16 17:24:58 +08:00
|
|
|
dout("sync_direct_%s on file %p %lld~%u snapc %p seq %lld\n",
|
|
|
|
(write ? "write" : "read"), file, pos, (unsigned)count,
|
|
|
|
snapc, snapc->seq);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count);
|
2010-02-10 03:14:41 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (write) {
|
2016-09-01 22:26:23 +08:00
|
|
|
int ret2 = invalidate_inode_pages2_range(inode->i_mapping,
|
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
|
|
|
pos >> PAGE_SHIFT,
|
|
|
|
(pos + count) >> PAGE_SHIFT);
|
2016-09-01 22:26:23 +08:00
|
|
|
if (ret2 < 0)
|
2016-11-08 21:35:59 +08:00
|
|
|
dout("invalidate_inode_pages2_range returned %d\n", ret2);
|
2010-02-10 03:14:41 +08:00
|
|
|
|
2017-08-16 17:27:05 +08:00
|
|
|
flags = /* CEPH_OSD_FLAG_ORDERSNAP | */ CEPH_OSD_FLAG_WRITE;
|
2015-12-23 21:23:38 +08:00
|
|
|
} else {
|
|
|
|
flags = CEPH_OSD_FLAG_READ;
|
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
while (iov_iter_count(iter) > 0) {
|
2018-05-04 22:57:31 +08:00
|
|
|
u64 size = iov_iter_count(iter);
|
2015-12-23 21:23:38 +08:00
|
|
|
ssize_t len;
|
2013-09-12 13:54:26 +08:00
|
|
|
|
2018-05-03 22:10:09 +08:00
|
|
|
if (write)
|
|
|
|
size = min_t(u64, size, fsc->mount_options->wsize);
|
|
|
|
else
|
|
|
|
size = min_t(u64, size, fsc->mount_options->rsize);
|
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
vino = ceph_vino(inode);
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
|
2015-12-23 21:23:38 +08:00
|
|
|
vino, pos, &size, 0,
|
2017-07-21 17:20:10 +08:00
|
|
|
1,
|
2015-12-23 21:23:38 +08:00
|
|
|
write ? CEPH_OSD_OP_WRITE :
|
|
|
|
CEPH_OSD_OP_READ,
|
|
|
|
flags, snapc,
|
2013-09-12 13:54:26 +08:00
|
|
|
ci->i_truncate_seq,
|
|
|
|
ci->i_truncate_size,
|
|
|
|
false);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
ret = PTR_ERR(req);
|
2014-04-04 10:44:19 +08:00
|
|
|
break;
|
2013-09-12 13:54:26 +08:00
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
len = iter_get_bvecs_alloc(iter, size, &bvecs, &num_pages);
|
|
|
|
if (len < 0) {
|
2014-04-04 10:58:25 +08:00
|
|
|
ceph_osdc_put_request(req);
|
2018-05-04 22:57:31 +08:00
|
|
|
ret = len;
|
2014-04-04 10:58:25 +08:00
|
|
|
break;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
2018-05-04 22:57:31 +08:00
|
|
|
if (len != size)
|
|
|
|
osd_req_op_extent_update(req, 0, len);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
/*
|
2015-12-23 21:23:38 +08:00
|
|
|
* To simplify error handling, allow AIO when IO within i_size
|
|
|
|
* or IO can be satisfied by single OSD request.
|
2009-10-07 02:31:08 +08:00
|
|
|
*/
|
2015-12-23 21:23:38 +08:00
|
|
|
if (pos == iocb->ki_pos && !is_sync_kiocb(iocb) &&
|
|
|
|
(len == count || pos + count <= i_size_read(inode))) {
|
|
|
|
aio_req = kzalloc(sizeof(*aio_req), GFP_KERNEL);
|
|
|
|
if (aio_req) {
|
|
|
|
aio_req->iocb = iocb;
|
|
|
|
aio_req->write = write;
|
2018-03-16 11:22:29 +08:00
|
|
|
aio_req->should_dirty = should_dirty;
|
2015-12-23 21:23:38 +08:00
|
|
|
INIT_LIST_HEAD(&aio_req->osd_reqs);
|
|
|
|
if (write) {
|
2015-12-24 08:44:20 +08:00
|
|
|
aio_req->mtime = mtime;
|
2015-12-23 21:23:38 +08:00
|
|
|
swap(aio_req->prealloc_cf, *pcf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* ignore error */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (write) {
|
|
|
|
/*
|
|
|
|
* throw out any page cache pages in this range. this
|
|
|
|
* may block.
|
|
|
|
*/
|
|
|
|
truncate_inode_pages_range(inode->i_mapping, pos,
|
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
|
|
|
(pos+len) | (PAGE_SIZE - 1));
|
2015-12-23 21:23:38 +08:00
|
|
|
|
2016-05-26 06:29:52 +08:00
|
|
|
req->r_mtime = mtime;
|
2015-12-23 21:23:38 +08:00
|
|
|
}
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
osd_req_op_extent_osd_data_bvecs(req, 0, bvecs, num_pages, len);
|
2013-09-12 13:54:26 +08:00
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (aio_req) {
|
|
|
|
aio_req->total_len += len;
|
|
|
|
aio_req->num_reqs++;
|
|
|
|
atomic_inc(&aio_req->pending_reqs);
|
|
|
|
|
|
|
|
req->r_callback = ceph_aio_complete_req;
|
|
|
|
req->r_inode = inode;
|
|
|
|
req->r_priv = aio_req;
|
|
|
|
list_add_tail(&req->r_unsafe_item, &aio_req->osd_reqs);
|
|
|
|
|
|
|
|
pos += len;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = ceph_osdc_start_request(req->r_osdc, req, false);
|
2013-09-12 13:54:26 +08:00
|
|
|
if (!ret)
|
|
|
|
ret = ceph_osdc_wait_request(&fsc->client->osdc, req);
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
size = i_size_read(inode);
|
|
|
|
if (!write) {
|
|
|
|
if (ret == -ENOENT)
|
|
|
|
ret = 0;
|
|
|
|
if (ret >= 0 && ret < len && pos + ret < size) {
|
2018-05-04 22:57:31 +08:00
|
|
|
struct iov_iter i;
|
2015-12-23 21:23:38 +08:00
|
|
|
int zlen = min_t(size_t, len - ret,
|
|
|
|
size - pos - ret);
|
2018-05-04 22:57:31 +08:00
|
|
|
|
|
|
|
iov_iter_bvec(&i, ITER_BVEC, bvecs, num_pages,
|
|
|
|
len);
|
|
|
|
iov_iter_advance(&i, ret);
|
|
|
|
iov_iter_zero(zlen, &i);
|
2015-12-23 21:23:38 +08:00
|
|
|
ret += zlen;
|
|
|
|
}
|
|
|
|
if (ret >= 0)
|
|
|
|
len = ret;
|
|
|
|
}
|
|
|
|
|
2018-05-04 22:57:31 +08:00
|
|
|
put_bvecs(bvecs, num_pages, should_dirty);
|
2013-09-12 13:54:26 +08:00
|
|
|
ceph_osdc_put_request(req);
|
2015-12-23 21:23:38 +08:00
|
|
|
if (ret < 0)
|
2013-09-12 13:54:26 +08:00
|
|
|
break;
|
2014-04-04 10:58:25 +08:00
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
pos += len;
|
|
|
|
if (!write && pos >= size)
|
2013-09-12 13:54:26 +08:00
|
|
|
break;
|
2014-04-04 10:58:25 +08:00
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (write && pos > size) {
|
|
|
|
if (ceph_inode_set_size(inode, pos))
|
2014-04-04 10:58:25 +08:00
|
|
|
ceph_check_caps(ceph_inode(inode),
|
|
|
|
CHECK_CAPS_AUTHONLY,
|
|
|
|
NULL);
|
|
|
|
}
|
2013-09-12 13:54:26 +08:00
|
|
|
}
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (aio_req) {
|
2016-06-14 11:13:59 +08:00
|
|
|
LIST_HEAD(osd_reqs);
|
|
|
|
|
2015-12-23 21:23:38 +08:00
|
|
|
if (aio_req->num_reqs == 0) {
|
|
|
|
kfree(aio_req);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ceph_get_cap_refs(ci, write ? CEPH_CAP_FILE_WR :
|
|
|
|
CEPH_CAP_FILE_RD);
|
|
|
|
|
2016-06-14 11:13:59 +08:00
|
|
|
list_splice(&aio_req->osd_reqs, &osd_reqs);
|
|
|
|
while (!list_empty(&osd_reqs)) {
|
|
|
|
req = list_first_entry(&osd_reqs,
|
2015-12-23 21:23:38 +08:00
|
|
|
struct ceph_osd_request,
|
|
|
|
r_unsafe_item);
|
|
|
|
list_del_init(&req->r_unsafe_item);
|
|
|
|
if (ret >= 0)
|
|
|
|
ret = ceph_osdc_start_request(req->r_osdc,
|
|
|
|
req, false);
|
|
|
|
if (ret < 0) {
|
|
|
|
req->r_result = ret;
|
2016-04-28 22:07:24 +08:00
|
|
|
ceph_aio_complete_req(req);
|
2015-12-23 21:23:38 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return -EIOCBQUEUED;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret != -EOLDSNAPC && pos > iocb->ki_pos) {
|
|
|
|
ret = pos - iocb->ki_pos;
|
2013-09-12 13:54:26 +08:00
|
|
|
iocb->ki_pos = pos;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Synchronous write, straight from __user pointer or user pages.
|
|
|
|
*
|
|
|
|
* If write spans object boundary, just do multiple writes. (For a
|
|
|
|
* correct atomic write, we should e.g. take write locks on all
|
|
|
|
* objects, rollback on failure, etc.)
|
|
|
|
*/
|
2014-07-28 14:33:46 +08:00
|
|
|
static ssize_t
|
2015-04-30 14:40:54 +08:00
|
|
|
ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
|
|
|
|
struct ceph_snap_context *snapc)
|
2013-09-12 13:54:26 +08:00
|
|
|
{
|
|
|
|
struct file *file = iocb->ki_filp;
|
|
|
|
struct inode *inode = file_inode(file);
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
|
|
|
struct ceph_vino vino;
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
struct page **pages;
|
|
|
|
u64 len;
|
|
|
|
int num_pages;
|
|
|
|
int written = 0;
|
|
|
|
int flags;
|
|
|
|
int ret;
|
2017-05-22 12:03:32 +08:00
|
|
|
bool check_caps = false;
|
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
|
|
|
struct timespec mtime = timespec64_to_timespec(current_time(inode));
|
2014-04-04 11:09:01 +08:00
|
|
|
size_t count = iov_iter_count(from);
|
2013-09-12 13:54:26 +08:00
|
|
|
|
|
|
|
if (ceph_snap(file_inode(file)) != CEPH_NOSNAP)
|
|
|
|
return -EROFS;
|
|
|
|
|
2017-08-16 17:24:58 +08:00
|
|
|
dout("sync_write on file %p %lld~%u snapc %p seq %lld\n",
|
|
|
|
file, pos, (unsigned)count, snapc, snapc->seq);
|
2013-09-12 13:54:26 +08:00
|
|
|
|
|
|
|
ret = filemap_write_and_wait_range(inode->i_mapping, pos, pos + count);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = invalidate_inode_pages2_range(inode->i_mapping,
|
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
|
|
|
pos >> PAGE_SHIFT,
|
|
|
|
(pos + count) >> PAGE_SHIFT);
|
2013-09-12 13:54:26 +08:00
|
|
|
if (ret < 0)
|
|
|
|
dout("invalidate_inode_pages2_range returned %d\n", ret);
|
|
|
|
|
2017-08-16 17:27:05 +08:00
|
|
|
flags = /* CEPH_OSD_FLAG_ORDERSNAP | */ CEPH_OSD_FLAG_WRITE;
|
2013-09-12 13:54:26 +08:00
|
|
|
|
2014-04-04 11:09:01 +08:00
|
|
|
while ((len = iov_iter_count(from)) > 0) {
|
2013-09-12 13:54:26 +08:00
|
|
|
size_t left;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
vino = ceph_vino(inode);
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
|
2014-11-13 14:40:37 +08:00
|
|
|
vino, pos, &len, 0, 1,
|
2013-09-12 13:54:26 +08:00
|
|
|
CEPH_OSD_OP_WRITE, flags, snapc,
|
|
|
|
ci->i_truncate_seq,
|
|
|
|
ci->i_truncate_size,
|
|
|
|
false);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
ret = PTR_ERR(req);
|
2014-04-04 10:44:19 +08:00
|
|
|
break;
|
2013-09-12 13:54:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* write from beginning of first page,
|
|
|
|
* regardless of io alignment
|
|
|
|
*/
|
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
|
|
|
num_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
|
2013-09-12 13:54:26 +08:00
|
|
|
|
2015-06-13 17:27:05 +08:00
|
|
|
pages = ceph_alloc_page_vector(num_pages, GFP_KERNEL);
|
2009-10-07 02:31:08 +08:00
|
|
|
if (IS_ERR(pages)) {
|
|
|
|
ret = PTR_ERR(pages);
|
|
|
|
goto out;
|
|
|
|
}
|
2013-09-12 13:54:26 +08:00
|
|
|
|
|
|
|
left = len;
|
|
|
|
for (n = 0; n < num_pages; n++) {
|
2014-01-29 01:16:18 +08:00
|
|
|
size_t plen = min_t(size_t, left, PAGE_SIZE);
|
2014-04-04 11:09:01 +08:00
|
|
|
ret = copy_page_from_iter(pages[n], 0, plen, from);
|
2013-09-12 13:54:26 +08:00
|
|
|
if (ret != plen) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
left -= ret;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
ceph_release_page_vector(pages, num_pages);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
req->r_inode = inode;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0,
|
|
|
|
false, true);
|
2013-03-15 03:09:06 +08:00
|
|
|
|
2016-05-26 06:29:52 +08:00
|
|
|
req->r_mtime = mtime;
|
2013-09-12 13:54:26 +08:00
|
|
|
ret = ceph_osdc_start_request(&fsc->client->osdc, req, false);
|
|
|
|
if (!ret)
|
|
|
|
ret = ceph_osdc_wait_request(&fsc->client->osdc, req);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
out:
|
2013-09-12 13:54:26 +08:00
|
|
|
ceph_osdc_put_request(req);
|
2017-04-04 20:39:46 +08:00
|
|
|
if (ret != 0) {
|
|
|
|
ceph_set_error_write(ci);
|
2013-09-12 13:54:26 +08:00
|
|
|
break;
|
2017-04-04 20:39:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ceph_clear_error_write(ci);
|
|
|
|
pos += len;
|
|
|
|
written += len;
|
|
|
|
if (pos > i_size_read(inode)) {
|
|
|
|
check_caps = ceph_inode_set_size(inode, pos);
|
|
|
|
if (check_caps)
|
|
|
|
ceph_check_caps(ceph_inode(inode),
|
|
|
|
CHECK_CAPS_AUTHONLY,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-09-12 13:54:26 +08:00
|
|
|
if (ret != -EOLDSNAPC && written > 0) {
|
2009-10-07 02:31:08 +08:00
|
|
|
ret = written;
|
2013-09-12 13:54:26 +08:00
|
|
|
iocb->ki_pos = pos;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wrap generic_file_aio_read with checks for cap bits on the inode.
|
|
|
|
* Atomically grab references, so that those bits are not released
|
|
|
|
* back to the MDS mid-read.
|
|
|
|
*
|
|
|
|
* Hmm, the sync read case isn't actually async... should it be?
|
|
|
|
*/
|
2014-04-03 08:28:01 +08:00
|
|
|
static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
|
|
|
struct file *filp = iocb->ki_filp;
|
2010-05-28 01:40:43 +08:00
|
|
|
struct ceph_file_info *fi = filp->private_data;
|
2015-02-12 02:56:46 +08:00
|
|
|
size_t len = iov_iter_count(to);
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(filp);
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2014-11-14 22:10:07 +08:00
|
|
|
struct page *pinned_page = NULL;
|
2009-10-07 02:31:08 +08:00
|
|
|
ssize_t ret;
|
2010-05-28 01:40:43 +08:00
|
|
|
int want, got = 0;
|
2014-11-14 22:36:18 +08:00
|
|
|
int retry_op = 0, read = 0;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2010-02-10 06:04:02 +08:00
|
|
|
again:
|
2013-09-26 14:42:17 +08:00
|
|
|
dout("aio_read %p %llx.%llx %llu~%u trying to get caps on %p\n",
|
|
|
|
inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len, inode);
|
|
|
|
|
2010-05-28 01:40:43 +08:00
|
|
|
if (fi->fmode & CEPH_FILE_MODE_LAZY)
|
|
|
|
want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO;
|
|
|
|
else
|
|
|
|
want = CEPH_CAP_FILE_CACHE;
|
2014-11-14 22:10:07 +08:00
|
|
|
ret = ceph_get_caps(ci, CEPH_CAP_FILE_RD, want, -1, &got, &pinned_page);
|
2009-10-07 02:31:08 +08:00
|
|
|
if (ret < 0)
|
2013-09-26 14:42:17 +08:00
|
|
|
return ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2010-05-28 01:40:43 +08:00
|
|
|
if ((got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) == 0 ||
|
2015-04-10 01:52:01 +08:00
|
|
|
(iocb->ki_flags & IOCB_DIRECT) ||
|
2013-09-26 14:42:17 +08:00
|
|
|
(fi->flags & CEPH_F_SYNC)) {
|
|
|
|
|
|
|
|
dout("aio_sync_read %p %llx.%llx %llu~%u got cap refs on %s\n",
|
|
|
|
inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len,
|
|
|
|
ceph_cap_string(got));
|
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
if (ci->i_inline_version == CEPH_INLINE_NONE) {
|
2015-12-23 21:23:38 +08:00
|
|
|
if (!retry_op && (iocb->ki_flags & IOCB_DIRECT)) {
|
|
|
|
ret = ceph_direct_read_write(iocb, to,
|
|
|
|
NULL, NULL);
|
|
|
|
if (ret >= 0 && ret < len)
|
|
|
|
retry_op = CHECK_EOF;
|
|
|
|
} else {
|
|
|
|
ret = ceph_sync_read(iocb, to, &retry_op);
|
|
|
|
}
|
2014-11-14 22:36:18 +08:00
|
|
|
} else {
|
|
|
|
retry_op = READ_INLINE;
|
|
|
|
}
|
2013-09-26 14:42:17 +08:00
|
|
|
} else {
|
2017-12-15 11:15:36 +08:00
|
|
|
CEPH_DEFINE_RW_CONTEXT(rw_ctx, got);
|
2013-09-26 14:42:17 +08:00
|
|
|
dout("aio_read %p %llx.%llx %llu~%u got cap refs on %s\n",
|
2014-04-03 08:28:01 +08:00
|
|
|
inode, ceph_vinop(inode), iocb->ki_pos, (unsigned)len,
|
2013-09-26 14:42:17 +08:00
|
|
|
ceph_cap_string(got));
|
2017-12-15 11:15:36 +08:00
|
|
|
ceph_add_rw_context(fi, &rw_ctx);
|
2014-04-03 08:28:01 +08:00
|
|
|
ret = generic_file_read_iter(iocb, to);
|
2017-12-15 11:15:36 +08:00
|
|
|
ceph_del_rw_context(fi, &rw_ctx);
|
2013-09-26 14:42:17 +08:00
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
dout("aio_read %p %llx.%llx dropping cap refs on %s = %d\n",
|
|
|
|
inode, ceph_vinop(inode), ceph_cap_string(got), (int)ret);
|
2014-11-14 22:10:07 +08:00
|
|
|
if (pinned_page) {
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
put_page(pinned_page);
|
2014-11-14 22:10:07 +08:00
|
|
|
pinned_page = NULL;
|
|
|
|
}
|
2009-10-07 02:31:08 +08:00
|
|
|
ceph_put_cap_refs(ci, got);
|
2015-12-23 21:23:38 +08:00
|
|
|
if (retry_op > HAVE_RETRIED && ret >= 0) {
|
2014-11-14 22:36:18 +08:00
|
|
|
int statret;
|
|
|
|
struct page *page = NULL;
|
|
|
|
loff_t i_size;
|
|
|
|
if (retry_op == READ_INLINE) {
|
2015-06-13 17:27:05 +08:00
|
|
|
page = __page_cache_alloc(GFP_KERNEL);
|
2014-11-14 22:36:18 +08:00
|
|
|
if (!page)
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-02-10 06:04:02 +08:00
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
statret = __ceph_do_getattr(inode, page,
|
|
|
|
CEPH_STAT_CAP_INLINE_DATA, !!page);
|
|
|
|
if (statret < 0) {
|
2016-10-10 20:38:18 +08:00
|
|
|
if (page)
|
|
|
|
__free_page(page);
|
2014-11-14 22:36:18 +08:00
|
|
|
if (statret == -ENODATA) {
|
|
|
|
BUG_ON(retry_op != READ_INLINE);
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
return statret;
|
|
|
|
}
|
2010-02-10 06:04:02 +08:00
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
i_size = i_size_read(inode);
|
|
|
|
if (retry_op == READ_INLINE) {
|
2015-01-10 11:43:12 +08:00
|
|
|
BUG_ON(ret > 0 || read > 0);
|
|
|
|
if (iocb->ki_pos < i_size &&
|
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
|
|
|
iocb->ki_pos < PAGE_SIZE) {
|
2014-11-14 22:36:18 +08:00
|
|
|
loff_t end = min_t(loff_t, i_size,
|
|
|
|
iocb->ki_pos + len);
|
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
|
|
|
end = min_t(loff_t, end, PAGE_SIZE);
|
2014-11-14 22:36:18 +08:00
|
|
|
if (statret < end)
|
|
|
|
zero_user_segment(page, statret, end);
|
|
|
|
ret = copy_page_to_iter(page,
|
|
|
|
iocb->ki_pos & ~PAGE_MASK,
|
|
|
|
end - iocb->ki_pos, to);
|
|
|
|
iocb->ki_pos += ret;
|
2015-01-10 11:43:12 +08:00
|
|
|
read += ret;
|
|
|
|
}
|
|
|
|
if (iocb->ki_pos < i_size && read < len) {
|
|
|
|
size_t zlen = min_t(size_t, len - read,
|
|
|
|
i_size - iocb->ki_pos);
|
|
|
|
ret = iov_iter_zero(zlen, to);
|
|
|
|
iocb->ki_pos += ret;
|
|
|
|
read += ret;
|
2014-11-14 22:36:18 +08:00
|
|
|
}
|
|
|
|
__free_pages(page, 0);
|
2015-01-10 11:43:12 +08:00
|
|
|
return read;
|
2014-11-14 22:36:18 +08:00
|
|
|
}
|
2010-02-10 06:04:02 +08:00
|
|
|
|
|
|
|
/* hit EOF or hole? */
|
2014-11-14 22:36:18 +08:00
|
|
|
if (retry_op == CHECK_EOF && iocb->ki_pos < i_size &&
|
2015-01-10 11:43:12 +08:00
|
|
|
ret < len) {
|
2013-09-26 14:42:17 +08:00
|
|
|
dout("sync_read hit hole, ppos %lld < size %lld"
|
2015-12-30 11:32:46 +08:00
|
|
|
", reading more\n", iocb->ki_pos, i_size);
|
2013-09-26 14:42:17 +08:00
|
|
|
|
2010-02-10 06:04:02 +08:00
|
|
|
read += ret;
|
|
|
|
len -= ret;
|
2015-12-23 21:23:38 +08:00
|
|
|
retry_op = HAVE_RETRIED;
|
2010-02-10 06:04:02 +08:00
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
}
|
2013-09-26 14:42:17 +08:00
|
|
|
|
2010-02-10 06:04:02 +08:00
|
|
|
if (ret >= 0)
|
|
|
|
ret += read;
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take cap references to avoid releasing caps to MDS mid-write.
|
|
|
|
*
|
|
|
|
* If we are synchronous, and write with an old snap context, the OSD
|
|
|
|
* may return EOLDSNAPC. In that case, retry the write.. _after_
|
|
|
|
* dropping our cap refs and allowing the pending snap to logically
|
|
|
|
* complete _before_ this write occurs.
|
|
|
|
*
|
|
|
|
* If we are near ENOSPC, write synchronously.
|
|
|
|
*/
|
2014-04-04 11:09:01 +08:00
|
|
|
static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
|
|
|
struct file *file = iocb->ki_filp;
|
2010-05-27 05:31:27 +08:00
|
|
|
struct ceph_file_info *fi = file->private_data;
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2009-10-07 02:31:08 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_osd_client *osdc =
|
|
|
|
&ceph_sb_to_client(inode->i_sb)->client->osdc;
|
2015-06-10 17:26:13 +08:00
|
|
|
struct ceph_cap_flush *prealloc_cf;
|
2015-04-10 00:55:47 +08:00
|
|
|
ssize_t count, written = 0;
|
2013-04-12 16:11:13 +08:00
|
|
|
int err, want, got;
|
2015-04-10 00:55:47 +08:00
|
|
|
loff_t pos;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
if (ceph_snap(inode) != CEPH_NOSNAP)
|
|
|
|
return -EROFS;
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
prealloc_cf = ceph_alloc_cap_flush();
|
|
|
|
if (!prealloc_cf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-08-14 10:50:50 +08:00
|
|
|
retry_snap:
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_lock(inode);
|
2013-04-12 16:11:13 +08:00
|
|
|
|
|
|
|
/* We can write back this queue in page reclaim */
|
2015-01-14 17:42:36 +08:00
|
|
|
current->backing_dev_info = inode_to_bdi(inode);
|
2013-04-12 16:11:13 +08:00
|
|
|
|
2015-09-07 11:35:01 +08:00
|
|
|
if (iocb->ki_flags & IOCB_APPEND) {
|
|
|
|
err = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE, false);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2015-04-10 00:55:47 +08:00
|
|
|
err = generic_write_checks(iocb, from);
|
|
|
|
if (err <= 0)
|
2013-04-12 16:11:13 +08:00
|
|
|
goto out;
|
|
|
|
|
2015-04-10 00:55:47 +08:00
|
|
|
pos = iocb->ki_pos;
|
|
|
|
count = iov_iter_count(from);
|
2018-01-05 18:47:21 +08:00
|
|
|
if (ceph_quota_is_max_bytes_exceeded(inode, pos + count)) {
|
|
|
|
err = -EDQUOT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2015-05-21 22:05:53 +08:00
|
|
|
err = file_remove_privs(file);
|
2013-04-12 16:11:13 +08:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = file_update_time(file);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
if (ci->i_inline_version != CEPH_INLINE_NONE) {
|
|
|
|
err = ceph_uninline_data(file, NULL);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2017-04-04 20:39:46 +08:00
|
|
|
/* FIXME: not complete since it doesn't account for being at quota */
|
2016-04-28 22:07:25 +08:00
|
|
|
if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL)) {
|
2013-04-12 16:11:13 +08:00
|
|
|
err = -ENOSPC;
|
2013-03-01 10:55:39 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2013-04-12 16:11:13 +08:00
|
|
|
|
2013-04-20 05:20:07 +08:00
|
|
|
dout("aio_write %p %llx.%llx %llu~%zd getting caps. i_size %llu\n",
|
2015-12-30 11:32:46 +08:00
|
|
|
inode, ceph_vinop(inode), pos, count, i_size_read(inode));
|
2013-05-02 12:15:58 +08:00
|
|
|
if (fi->fmode & CEPH_FILE_MODE_LAZY)
|
|
|
|
want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;
|
|
|
|
else
|
|
|
|
want = CEPH_CAP_FILE_BUFFER;
|
2013-04-12 16:11:13 +08:00
|
|
|
got = 0;
|
2014-11-14 22:10:07 +08:00
|
|
|
err = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, pos + count,
|
|
|
|
&got, NULL);
|
2013-04-12 16:11:13 +08:00
|
|
|
if (err < 0)
|
2013-04-12 16:11:10 +08:00
|
|
|
goto out;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2013-04-20 05:20:07 +08:00
|
|
|
dout("aio_write %p %llx.%llx %llu~%zd got cap refs on %s\n",
|
2013-04-12 16:11:13 +08:00
|
|
|
inode, ceph_vinop(inode), pos, count, ceph_cap_string(got));
|
2013-05-02 12:15:58 +08:00
|
|
|
|
|
|
|
if ((got & (CEPH_CAP_FILE_BUFFER|CEPH_CAP_FILE_LAZYIO)) == 0 ||
|
2017-04-04 20:39:46 +08:00
|
|
|
(iocb->ki_flags & IOCB_DIRECT) || (fi->flags & CEPH_F_SYNC) ||
|
|
|
|
(ci->i_ceph_flags & CEPH_I_ERROR_WRITE)) {
|
2015-04-30 14:40:54 +08:00
|
|
|
struct ceph_snap_context *snapc;
|
2014-04-04 11:09:01 +08:00
|
|
|
struct iov_iter data;
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2015-04-30 14:40:54 +08:00
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
if (__ceph_have_pending_cap_snap(ci)) {
|
|
|
|
struct ceph_cap_snap *capsnap =
|
|
|
|
list_last_entry(&ci->i_cap_snaps,
|
|
|
|
struct ceph_cap_snap,
|
|
|
|
ci_item);
|
|
|
|
snapc = ceph_get_snap_context(capsnap->context);
|
|
|
|
} else {
|
|
|
|
BUG_ON(!ci->i_head_snapc);
|
|
|
|
snapc = ceph_get_snap_context(ci->i_head_snapc);
|
|
|
|
}
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
|
2014-04-04 11:09:01 +08:00
|
|
|
/* we might need to revert back to that point */
|
|
|
|
data = *from;
|
2015-04-10 01:52:01 +08:00
|
|
|
if (iocb->ki_flags & IOCB_DIRECT)
|
2015-12-23 21:23:38 +08:00
|
|
|
written = ceph_direct_read_write(iocb, &data, snapc,
|
|
|
|
&prealloc_cf);
|
2013-09-12 13:54:26 +08:00
|
|
|
else
|
2015-04-30 14:40:54 +08:00
|
|
|
written = ceph_sync_write(iocb, &data, pos, snapc);
|
2014-04-04 11:09:01 +08:00
|
|
|
if (written > 0)
|
|
|
|
iov_iter_advance(from, written);
|
2015-04-30 14:40:54 +08:00
|
|
|
ceph_put_snap_context(snapc);
|
2013-05-02 12:15:58 +08:00
|
|
|
} else {
|
2013-08-13 12:42:15 +08:00
|
|
|
/*
|
|
|
|
* No need to acquire the i_truncate_mutex. Because
|
|
|
|
* the MDS revokes Fwb caps before sending truncate
|
|
|
|
* message to us. We can't get Fwb cap while there
|
|
|
|
* are pending vmtruncate. So write and vmtruncate
|
|
|
|
* can not run at the same time
|
|
|
|
*/
|
2014-04-04 11:09:01 +08:00
|
|
|
written = generic_perform_write(file, from, pos);
|
2014-02-12 11:28:43 +08:00
|
|
|
if (likely(written >= 0))
|
|
|
|
iocb->ki_pos = pos + written;
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2013-05-02 12:15:58 +08:00
|
|
|
}
|
2011-07-27 02:27:34 +08:00
|
|
|
|
2013-04-12 16:11:13 +08:00
|
|
|
if (written >= 0) {
|
2011-05-05 02:33:47 +08:00
|
|
|
int dirty;
|
2018-01-05 18:47:22 +08:00
|
|
|
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2014-11-14 22:38:29 +08:00
|
|
|
ci->i_inline_version = CEPH_INLINE_NONE;
|
2015-06-10 17:26:13 +08:00
|
|
|
dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
|
|
|
|
&prealloc_cf);
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2011-05-05 02:33:47 +08:00
|
|
|
if (dirty)
|
|
|
|
__mark_inode_dirty(inode, dirty);
|
2018-01-05 18:47:22 +08:00
|
|
|
if (ceph_quota_is_max_bytes_approaching(inode, iocb->ki_pos))
|
|
|
|
ceph_check_caps(ci, CHECK_CAPS_NODELAY, NULL);
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
2013-05-02 12:15:58 +08:00
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
dout("aio_write %p %llx.%llx %llu~%u dropping cap refs on %s\n",
|
2014-04-04 11:09:01 +08:00
|
|
|
inode, ceph_vinop(inode), pos, (unsigned)count,
|
2013-05-02 12:15:58 +08:00
|
|
|
ceph_cap_string(got));
|
2009-10-07 02:31:08 +08:00
|
|
|
ceph_put_cap_refs(ci, got);
|
2013-05-02 12:15:58 +08:00
|
|
|
|
2017-08-14 10:50:50 +08:00
|
|
|
if (written == -EOLDSNAPC) {
|
|
|
|
dout("aio_write %p %llx.%llx %llu~%u" "got EOLDSNAPC, retrying\n",
|
|
|
|
inode, ceph_vinop(inode), pos, (unsigned)count);
|
|
|
|
goto retry_snap;
|
|
|
|
}
|
|
|
|
|
2016-04-07 23:52:02 +08:00
|
|
|
if (written >= 0) {
|
2016-04-28 22:07:25 +08:00
|
|
|
if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_NEARFULL))
|
2016-04-07 23:52:02 +08:00
|
|
|
iocb->ki_flags |= IOCB_DSYNC;
|
|
|
|
written = generic_write_sync(iocb, written);
|
2013-03-01 10:55:39 +08:00
|
|
|
}
|
2013-04-12 16:11:13 +08:00
|
|
|
|
2013-08-10 00:57:58 +08:00
|
|
|
goto out_unlocked;
|
|
|
|
|
2013-04-12 16:11:13 +08:00
|
|
|
out:
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2013-08-10 00:57:58 +08:00
|
|
|
out_unlocked:
|
2015-06-10 17:26:13 +08:00
|
|
|
ceph_free_cap_flush(prealloc_cf);
|
2013-04-12 16:11:13 +08:00
|
|
|
current->backing_dev_info = NULL;
|
|
|
|
return written ? written : err;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* llseek. be sure to verify file size on SEEK_END.
|
|
|
|
*/
|
2012-12-18 07:59:39 +08:00
|
|
|
static loff_t ceph_llseek(struct file *file, loff_t offset, int whence)
|
2009-10-07 02:31:08 +08:00
|
|
|
{
|
|
|
|
struct inode *inode = file->f_mapping->host;
|
2015-12-30 11:32:46 +08:00
|
|
|
loff_t i_size;
|
2016-07-22 01:43:09 +08:00
|
|
|
loff_t ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_lock(inode);
|
2011-12-14 01:19:26 +08:00
|
|
|
|
2012-12-18 07:59:39 +08:00
|
|
|
if (whence == SEEK_END || whence == SEEK_DATA || whence == SEEK_HOLE) {
|
2014-09-16 21:46:17 +08:00
|
|
|
ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE, false);
|
2016-07-22 01:43:09 +08:00
|
|
|
if (ret < 0)
|
2009-10-07 02:31:08 +08:00
|
|
|
goto out;
|
2011-07-19 01:21:38 +08:00
|
|
|
}
|
|
|
|
|
2015-12-30 11:32:46 +08:00
|
|
|
i_size = i_size_read(inode);
|
2012-12-18 07:59:39 +08:00
|
|
|
switch (whence) {
|
2011-07-19 01:21:38 +08:00
|
|
|
case SEEK_END:
|
2015-12-30 11:32:46 +08:00
|
|
|
offset += i_size;
|
2009-10-07 02:31:08 +08:00
|
|
|
break;
|
|
|
|
case SEEK_CUR:
|
|
|
|
/*
|
|
|
|
* Here we special-case the lseek(fd, 0, SEEK_CUR)
|
|
|
|
* position-querying operation. Avoid rewriting the "same"
|
|
|
|
* f_pos value back to the file because a concurrent read(),
|
|
|
|
* write() or lseek() might have altered it
|
|
|
|
*/
|
|
|
|
if (offset == 0) {
|
2016-07-22 01:43:09 +08:00
|
|
|
ret = file->f_pos;
|
2009-10-07 02:31:08 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
offset += file->f_pos;
|
|
|
|
break;
|
2011-07-19 01:21:38 +08:00
|
|
|
case SEEK_DATA:
|
2017-07-28 18:56:40 +08:00
|
|
|
if (offset < 0 || offset >= i_size) {
|
2011-07-19 01:21:38 +08:00
|
|
|
ret = -ENXIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case SEEK_HOLE:
|
2017-07-28 18:56:40 +08:00
|
|
|
if (offset < 0 || offset >= i_size) {
|
2011-07-19 01:21:38 +08:00
|
|
|
ret = -ENXIO;
|
|
|
|
goto out;
|
|
|
|
}
|
2015-12-30 11:32:46 +08:00
|
|
|
offset = i_size;
|
2011-07-19 01:21:38 +08:00
|
|
|
break;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
|
2016-07-22 01:43:09 +08:00
|
|
|
ret = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
|
2009-10-07 02:31:08 +08:00
|
|
|
|
|
|
|
out:
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2016-07-22 01:43:09 +08:00
|
|
|
return ret;
|
2009-10-07 02:31:08 +08:00
|
|
|
}
|
|
|
|
|
2013-08-15 11:51:44 +08:00
|
|
|
static inline void ceph_zero_partial_page(
|
|
|
|
struct inode *inode, loff_t offset, unsigned size)
|
|
|
|
{
|
|
|
|
struct page *page;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
pgoff_t index = offset >> PAGE_SHIFT;
|
2013-08-15 11:51:44 +08:00
|
|
|
|
|
|
|
page = find_lock_page(inode->i_mapping, index);
|
|
|
|
if (page) {
|
|
|
|
wait_on_page_writeback(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
zero_user(page, offset & (PAGE_SIZE - 1), size);
|
2013-08-15 11:51:44 +08:00
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 20:29:47 +08:00
|
|
|
put_page(page);
|
2013-08-15 11:51:44 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,
|
|
|
|
loff_t length)
|
|
|
|
{
|
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
|
|
|
loff_t nearly = round_up(offset, PAGE_SIZE);
|
2013-08-15 11:51:44 +08:00
|
|
|
if (offset < nearly) {
|
|
|
|
loff_t size = nearly - offset;
|
|
|
|
if (length < size)
|
|
|
|
size = length;
|
|
|
|
ceph_zero_partial_page(inode, offset, size);
|
|
|
|
offset += size;
|
|
|
|
length -= size;
|
|
|
|
}
|
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 (length >= PAGE_SIZE) {
|
|
|
|
loff_t size = round_down(length, PAGE_SIZE);
|
2013-08-15 11:51:44 +08:00
|
|
|
truncate_pagecache_range(inode, offset, offset + size - 1);
|
|
|
|
offset += size;
|
|
|
|
length -= size;
|
|
|
|
}
|
|
|
|
if (length)
|
|
|
|
ceph_zero_partial_page(inode, offset, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ceph_zero_partial_object(struct inode *inode,
|
|
|
|
loff_t offset, loff_t *length)
|
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
int ret = 0;
|
|
|
|
loff_t zero = 0;
|
|
|
|
int op;
|
|
|
|
|
|
|
|
if (!length) {
|
|
|
|
op = offset ? CEPH_OSD_OP_DELETE : CEPH_OSD_OP_TRUNCATE;
|
|
|
|
length = &zero;
|
|
|
|
} else {
|
|
|
|
op = CEPH_OSD_OP_ZERO;
|
|
|
|
}
|
|
|
|
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
|
|
|
|
ceph_vino(inode),
|
|
|
|
offset, length,
|
2014-11-13 14:40:37 +08:00
|
|
|
0, 1, op,
|
2017-02-12 01:48:41 +08:00
|
|
|
CEPH_OSD_FLAG_WRITE,
|
2013-08-15 11:51:44 +08:00
|
|
|
NULL, 0, 0, false);
|
|
|
|
if (IS_ERR(req)) {
|
|
|
|
ret = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
req->r_mtime = timespec64_to_timespec(inode->i_mtime);
|
2013-08-15 11:51:44 +08:00
|
|
|
ret = ceph_osdc_start_request(&fsc->client->osdc, req, false);
|
|
|
|
if (!ret) {
|
|
|
|
ret = ceph_osdc_wait_request(&fsc->client->osdc, req);
|
|
|
|
if (ret == -ENOENT)
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2016-02-03 21:24:49 +08:00
|
|
|
s32 stripe_unit = ci->i_layout.stripe_unit;
|
|
|
|
s32 stripe_count = ci->i_layout.stripe_count;
|
|
|
|
s32 object_size = ci->i_layout.object_size;
|
2013-08-28 03:15:16 +08:00
|
|
|
u64 object_set_size = object_size * stripe_count;
|
|
|
|
u64 nearly, t;
|
|
|
|
|
|
|
|
/* round offset up to next period boundary */
|
|
|
|
nearly = offset + object_set_size - 1;
|
|
|
|
t = nearly;
|
|
|
|
nearly -= do_div(t, object_set_size);
|
2013-08-15 11:51:44 +08:00
|
|
|
|
|
|
|
while (length && offset < nearly) {
|
|
|
|
loff_t size = length;
|
|
|
|
ret = ceph_zero_partial_object(inode, offset, &size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
offset += size;
|
|
|
|
length -= size;
|
|
|
|
}
|
|
|
|
while (length >= object_set_size) {
|
|
|
|
int i;
|
|
|
|
loff_t pos = offset;
|
|
|
|
for (i = 0; i < stripe_count; ++i) {
|
|
|
|
ret = ceph_zero_partial_object(inode, pos, NULL);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
pos += stripe_unit;
|
|
|
|
}
|
|
|
|
offset += object_set_size;
|
|
|
|
length -= object_set_size;
|
|
|
|
}
|
|
|
|
while (length) {
|
|
|
|
loff_t size = length;
|
|
|
|
ret = ceph_zero_partial_object(inode, offset, &size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
offset += size;
|
|
|
|
length -= size;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static long ceph_fallocate(struct file *file, int mode,
|
|
|
|
loff_t offset, loff_t length)
|
|
|
|
{
|
|
|
|
struct ceph_file_info *fi = file->private_data;
|
2013-12-11 13:49:11 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2013-08-15 11:51:44 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_osd_client *osdc =
|
|
|
|
&ceph_inode_to_client(inode)->client->osdc;
|
2015-06-10 17:26:13 +08:00
|
|
|
struct ceph_cap_flush *prealloc_cf;
|
2013-08-15 11:51:44 +08:00
|
|
|
int want, got = 0;
|
|
|
|
int dirty;
|
|
|
|
int ret = 0;
|
|
|
|
loff_t endoff = 0;
|
|
|
|
loff_t size;
|
|
|
|
|
2014-06-26 15:25:17 +08:00
|
|
|
if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE))
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2013-08-15 11:51:44 +08:00
|
|
|
if (!S_ISREG(inode->i_mode))
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
prealloc_cf = ceph_alloc_cap_flush();
|
|
|
|
if (!prealloc_cf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_lock(inode);
|
2013-08-15 11:51:44 +08:00
|
|
|
|
|
|
|
if (ceph_snap(inode) != CEPH_NOSNAP) {
|
|
|
|
ret = -EROFS;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2018-01-05 18:47:21 +08:00
|
|
|
if (!(mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE)) &&
|
|
|
|
ceph_quota_is_max_bytes_exceeded(inode, offset + length)) {
|
|
|
|
ret = -EDQUOT;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2016-04-28 22:07:25 +08:00
|
|
|
if (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) &&
|
|
|
|
!(mode & FALLOC_FL_PUNCH_HOLE)) {
|
2013-08-15 11:51:44 +08:00
|
|
|
ret = -ENOSPC;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
if (ci->i_inline_version != CEPH_INLINE_NONE) {
|
|
|
|
ret = ceph_uninline_data(file, NULL);
|
|
|
|
if (ret < 0)
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2013-08-15 11:51:44 +08:00
|
|
|
size = i_size_read(inode);
|
2017-05-06 01:28:44 +08:00
|
|
|
if (!(mode & FALLOC_FL_KEEP_SIZE)) {
|
2013-08-15 11:51:44 +08:00
|
|
|
endoff = offset + length;
|
2017-05-06 01:28:44 +08:00
|
|
|
ret = inode_newsize_ok(inode, endoff);
|
|
|
|
if (ret)
|
|
|
|
goto unlock;
|
|
|
|
}
|
2013-08-15 11:51:44 +08:00
|
|
|
|
|
|
|
if (fi->fmode & CEPH_FILE_MODE_LAZY)
|
|
|
|
want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;
|
|
|
|
else
|
|
|
|
want = CEPH_CAP_FILE_BUFFER;
|
|
|
|
|
2014-11-14 22:10:07 +08:00
|
|
|
ret = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, endoff, &got, NULL);
|
2013-08-15 11:51:44 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
if (mode & FALLOC_FL_PUNCH_HOLE) {
|
|
|
|
if (offset < size)
|
|
|
|
ceph_zero_pagecache_range(inode, offset, length);
|
|
|
|
ret = ceph_zero_objects(inode, offset, length);
|
|
|
|
} else if (endoff > size) {
|
|
|
|
truncate_pagecache_range(inode, size, -1);
|
|
|
|
if (ceph_inode_set_size(inode, endoff))
|
|
|
|
ceph_check_caps(ceph_inode(inode),
|
|
|
|
CHECK_CAPS_AUTHONLY, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ret) {
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2014-11-14 22:38:29 +08:00
|
|
|
ci->i_inline_version = CEPH_INLINE_NONE;
|
2015-06-10 17:26:13 +08:00
|
|
|
dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
|
|
|
|
&prealloc_cf);
|
2013-08-15 11:51:44 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
if (dirty)
|
|
|
|
__mark_inode_dirty(inode, dirty);
|
2018-01-05 18:47:22 +08:00
|
|
|
if ((endoff > size) &&
|
|
|
|
ceph_quota_is_max_bytes_approaching(inode, endoff))
|
|
|
|
ceph_check_caps(ci, CHECK_CAPS_NODELAY, NULL);
|
2013-08-15 11:51:44 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ceph_put_cap_refs(ci, got);
|
|
|
|
unlock:
|
2016-01-23 04:40:57 +08:00
|
|
|
inode_unlock(inode);
|
2015-06-10 17:26:13 +08:00
|
|
|
ceph_free_cap_flush(prealloc_cf);
|
2013-08-15 11:51:44 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:08 +08:00
|
|
|
const struct file_operations ceph_file_fops = {
|
|
|
|
.open = ceph_open,
|
|
|
|
.release = ceph_release,
|
|
|
|
.llseek = ceph_llseek,
|
2014-04-03 08:28:01 +08:00
|
|
|
.read_iter = ceph_read_iter,
|
2014-04-04 11:09:01 +08:00
|
|
|
.write_iter = ceph_write_iter,
|
2009-10-07 02:31:08 +08:00
|
|
|
.mmap = ceph_mmap,
|
|
|
|
.fsync = ceph_fsync,
|
2010-08-03 06:34:23 +08:00
|
|
|
.lock = ceph_lock,
|
|
|
|
.flock = ceph_flock,
|
2016-11-08 21:54:34 +08:00
|
|
|
.splice_read = generic_file_splice_read,
|
2014-04-05 16:40:12 +08:00
|
|
|
.splice_write = iter_file_splice_write,
|
2009-10-07 02:31:08 +08:00
|
|
|
.unlocked_ioctl = ceph_ioctl,
|
|
|
|
.compat_ioctl = ceph_ioctl,
|
2013-08-15 11:51:44 +08:00
|
|
|
.fallocate = ceph_fallocate,
|
2009-10-07 02:31:08 +08:00
|
|
|
};
|
|
|
|
|