License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* linux/fs/nfs/nfs2xdr.c
|
|
|
|
*
|
|
|
|
* XDR functions to encode/decode NFS RPC arguments and results.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994 Rick Sladkey
|
|
|
|
* Copyright (C) 1996 Olaf Kirch
|
|
|
|
* 04 Aug 1998 Ion Badulescu <ionut@cs.columbia.edu>
|
|
|
|
* FIFO's need special handling in NFSv2
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/param.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/sunrpc/clnt.h>
|
|
|
|
#include <linux/nfs.h>
|
|
|
|
#include <linux/nfs2.h>
|
|
|
|
#include <linux/nfs_fs.h>
|
2019-02-12 00:24:26 +08:00
|
|
|
#include "nfstrace.h"
|
2006-06-24 20:41:41 +08:00
|
|
|
#include "internal.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#define NFSDBG_FACILITY NFSDBG_XDR
|
|
|
|
|
|
|
|
/* Mapping from NFS error code to "errno" error code. */
|
|
|
|
#define errno_NFSERR_IO EIO
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Declare the space requirements for NFS arguments and replies as
|
|
|
|
* number of 32bit-words
|
|
|
|
*/
|
|
|
|
#define NFS_fhandle_sz (8)
|
|
|
|
#define NFS_sattr_sz (8)
|
|
|
|
#define NFS_filename_sz (1+(NFS2_MAXNAMLEN>>2))
|
|
|
|
#define NFS_path_sz (1+(NFS2_MAXPATHLEN>>2))
|
|
|
|
#define NFS_fattr_sz (17)
|
|
|
|
#define NFS_info_sz (5)
|
|
|
|
#define NFS_entry_sz (NFS_filename_sz+3)
|
|
|
|
|
|
|
|
#define NFS_diropargs_sz (NFS_fhandle_sz+NFS_filename_sz)
|
2007-07-15 03:39:57 +08:00
|
|
|
#define NFS_removeargs_sz (NFS_fhandle_sz+NFS_filename_sz)
|
2005-04-17 06:20:36 +08:00
|
|
|
#define NFS_sattrargs_sz (NFS_fhandle_sz+NFS_sattr_sz)
|
|
|
|
#define NFS_readlinkargs_sz (NFS_fhandle_sz)
|
|
|
|
#define NFS_readargs_sz (NFS_fhandle_sz+3)
|
|
|
|
#define NFS_writeargs_sz (NFS_fhandle_sz+4)
|
|
|
|
#define NFS_createargs_sz (NFS_diropargs_sz+NFS_sattr_sz)
|
|
|
|
#define NFS_renameargs_sz (NFS_diropargs_sz+NFS_diropargs_sz)
|
|
|
|
#define NFS_linkargs_sz (NFS_fhandle_sz+NFS_diropargs_sz)
|
2006-08-23 08:06:23 +08:00
|
|
|
#define NFS_symlinkargs_sz (NFS_diropargs_sz+1+NFS_sattr_sz)
|
2005-04-17 06:20:36 +08:00
|
|
|
#define NFS_readdirargs_sz (NFS_fhandle_sz+2)
|
|
|
|
|
|
|
|
#define NFS_attrstat_sz (1+NFS_fattr_sz)
|
|
|
|
#define NFS_diropres_sz (1+NFS_fhandle_sz+NFS_fattr_sz)
|
2019-02-12 00:25:25 +08:00
|
|
|
#define NFS_readlinkres_sz (2+1)
|
|
|
|
#define NFS_readres_sz (1+NFS_fattr_sz+1+1)
|
2005-04-17 06:20:36 +08:00
|
|
|
#define NFS_writeres_sz (NFS_attrstat_sz)
|
|
|
|
#define NFS_stat_sz (1)
|
2019-02-12 00:25:25 +08:00
|
|
|
#define NFS_readdirres_sz (1+1)
|
2005-04-17 06:20:36 +08:00
|
|
|
#define NFS_statfsres_sz (1+NFS_info_sz)
|
|
|
|
|
2012-05-11 04:47:18 +08:00
|
|
|
static int nfs_stat_to_errno(enum nfs_stat);
|
2010-12-14 22:54:30 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Encode/decode NFSv2 basic data types
|
|
|
|
*
|
|
|
|
* Basic NFSv2 data types are defined in section 2.3 of RFC 1094:
|
|
|
|
* "NFS: Network File System Protocol Specification".
|
|
|
|
*
|
|
|
|
* Not all basic data types have their own encoding and decoding
|
|
|
|
* functions. For run-time efficiency, some data types are encoded
|
|
|
|
* or decoded inline.
|
|
|
|
*/
|
|
|
|
|
2019-04-25 05:46:48 +08:00
|
|
|
static struct user_namespace *rpc_userns(const struct rpc_clnt *clnt)
|
|
|
|
{
|
|
|
|
if (clnt && clnt->cl_cred)
|
|
|
|
return clnt->cl_cred->user_ns;
|
|
|
|
return &init_user_ns;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct user_namespace *rpc_rqst_userns(const struct rpc_rqst *rqstp)
|
|
|
|
{
|
|
|
|
if (rqstp->rq_task)
|
|
|
|
return rpc_userns(rqstp->rq_task->tk_client);
|
|
|
|
return &init_user_ns;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
/*
|
|
|
|
* typedef opaque nfsdata<>;
|
|
|
|
*/
|
2014-05-06 21:12:25 +08:00
|
|
|
static int decode_nfsdata(struct xdr_stream *xdr, struct nfs_pgio_res *result)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
u32 recvd, count;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
count = be32_to_cpup(p);
|
2012-06-21 10:35:05 +08:00
|
|
|
recvd = xdr_read_pages(xdr, count);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(count > recvd))
|
|
|
|
goto out_cheating;
|
|
|
|
out:
|
|
|
|
result->eof = 0; /* NFSv2 does not pass EOF flag on the wire. */
|
|
|
|
result->count = count;
|
|
|
|
return count;
|
|
|
|
out_cheating:
|
|
|
|
dprintk("NFS: server cheating in read result: "
|
|
|
|
"count %u > recvd %u\n", count, recvd);
|
|
|
|
count = recvd;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* enum stat {
|
|
|
|
* NFS_OK = 0,
|
|
|
|
* NFSERR_PERM = 1,
|
|
|
|
* NFSERR_NOENT = 2,
|
|
|
|
* NFSERR_IO = 5,
|
|
|
|
* NFSERR_NXIO = 6,
|
|
|
|
* NFSERR_ACCES = 13,
|
|
|
|
* NFSERR_EXIST = 17,
|
|
|
|
* NFSERR_NODEV = 19,
|
|
|
|
* NFSERR_NOTDIR = 20,
|
|
|
|
* NFSERR_ISDIR = 21,
|
|
|
|
* NFSERR_FBIG = 27,
|
|
|
|
* NFSERR_NOSPC = 28,
|
|
|
|
* NFSERR_ROFS = 30,
|
|
|
|
* NFSERR_NAMETOOLONG = 63,
|
|
|
|
* NFSERR_NOTEMPTY = 66,
|
|
|
|
* NFSERR_DQUOT = 69,
|
|
|
|
* NFSERR_STALE = 70,
|
|
|
|
* NFSERR_WFLUSH = 99
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static int decode_stat(struct xdr_stream *xdr, enum nfs_stat *status)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2019-02-12 00:24:26 +08:00
|
|
|
if (unlikely(*p != cpu_to_be32(NFS_OK)))
|
|
|
|
goto out_status;
|
|
|
|
*status = 0;
|
|
|
|
return 0;
|
|
|
|
out_status:
|
2010-12-14 22:55:10 +08:00
|
|
|
*status = be32_to_cpup(p);
|
2019-06-19 22:34:09 +08:00
|
|
|
trace_nfs_xdr_status(xdr, (int)*status);
|
2010-12-14 22:55:10 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:30 +08:00
|
|
|
/*
|
|
|
|
* 2.3.2. ftype
|
|
|
|
*
|
|
|
|
* enum ftype {
|
|
|
|
* NFNON = 0,
|
|
|
|
* NFREG = 1,
|
|
|
|
* NFDIR = 2,
|
|
|
|
* NFBLK = 3,
|
|
|
|
* NFCHR = 4,
|
|
|
|
* NFLNK = 5
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static __be32 *xdr_decode_ftype(__be32 *p, u32 *type)
|
|
|
|
{
|
|
|
|
*type = be32_to_cpup(p++);
|
|
|
|
if (unlikely(*type > NF2FIFO))
|
|
|
|
*type = NFBAD;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:30 +08:00
|
|
|
/*
|
|
|
|
* 2.3.3. fhandle
|
|
|
|
*
|
|
|
|
* typedef opaque fhandle[FHSIZE];
|
|
|
|
*/
|
|
|
|
static void encode_fhandle(struct xdr_stream *xdr, const struct nfs_fh *fh)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, NFS2_FHSIZE);
|
|
|
|
memcpy(p, fh->data, NFS2_FHSIZE);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
static int decode_fhandle(struct xdr_stream *xdr, struct nfs_fh *fh)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, NFS2_FHSIZE);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
fh->size = NFS2_FHSIZE;
|
|
|
|
memcpy(fh->data, p, NFS2_FHSIZE);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:50 +08:00
|
|
|
/*
|
|
|
|
* 2.3.4. timeval
|
|
|
|
*
|
|
|
|
* struct timeval {
|
|
|
|
* unsigned int seconds;
|
|
|
|
* unsigned int useconds;
|
|
|
|
* };
|
|
|
|
*/
|
2019-10-05 04:57:45 +08:00
|
|
|
static __be32 *xdr_encode_time(__be32 *p, const struct timespec64 *timep)
|
2010-12-14 22:54:50 +08:00
|
|
|
{
|
2019-10-05 04:57:45 +08:00
|
|
|
*p++ = cpu_to_be32((u32)timep->tv_sec);
|
2010-12-14 22:54:50 +08:00
|
|
|
if (timep->tv_nsec != 0)
|
|
|
|
*p++ = cpu_to_be32(timep->tv_nsec / NSEC_PER_USEC);
|
|
|
|
else
|
|
|
|
*p++ = cpu_to_be32(0);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Passing the invalid value useconds=1000000 is a Sun convention for
|
|
|
|
* "set to current server time". It's needed to make permissions checks
|
|
|
|
* for the "touch" program across v2 mounts to Solaris and Irix servers
|
|
|
|
* work correctly. See description of sattr in section 6.1 of "NFS
|
|
|
|
* Illustrated" by Brent Callaghan, Addison-Wesley, ISBN 0-201-32750-5.
|
|
|
|
*/
|
|
|
|
static __be32 *xdr_encode_current_server_time(__be32 *p,
|
2019-10-05 04:57:45 +08:00
|
|
|
const struct timespec64 *timep)
|
2010-12-14 22:54:50 +08:00
|
|
|
{
|
|
|
|
*p++ = cpu_to_be32(timep->tv_sec);
|
|
|
|
*p++ = cpu_to_be32(1000000);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2019-10-05 04:38:56 +08:00
|
|
|
static __be32 *xdr_decode_time(__be32 *p, struct timespec64 *timep)
|
2010-12-14 22:55:30 +08:00
|
|
|
{
|
|
|
|
timep->tv_sec = be32_to_cpup(p++);
|
|
|
|
timep->tv_nsec = be32_to_cpup(p++) * NSEC_PER_USEC;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
/*
|
|
|
|
* 2.3.5. fattr
|
|
|
|
*
|
|
|
|
* struct fattr {
|
|
|
|
* ftype type;
|
|
|
|
* unsigned int mode;
|
|
|
|
* unsigned int nlink;
|
|
|
|
* unsigned int uid;
|
|
|
|
* unsigned int gid;
|
|
|
|
* unsigned int size;
|
|
|
|
* unsigned int blocksize;
|
|
|
|
* unsigned int rdev;
|
|
|
|
* unsigned int blocks;
|
|
|
|
* unsigned int fsid;
|
|
|
|
* unsigned int fileid;
|
|
|
|
* timeval atime;
|
|
|
|
* timeval mtime;
|
|
|
|
* timeval ctime;
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
*/
|
2019-04-25 05:46:48 +08:00
|
|
|
static int decode_fattr(struct xdr_stream *xdr, struct nfs_fattr *fattr,
|
|
|
|
struct user_namespace *userns)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
2010-12-14 22:55:30 +08:00
|
|
|
u32 rdev, type;
|
2010-12-14 22:55:10 +08:00
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, NFS_fattr_sz << 2);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:30 +08:00
|
|
|
|
|
|
|
fattr->valid |= NFS_ATTR_FATTR_V2;
|
|
|
|
|
|
|
|
p = xdr_decode_ftype(p, &type);
|
|
|
|
|
|
|
|
fattr->mode = be32_to_cpup(p++);
|
|
|
|
fattr->nlink = be32_to_cpup(p++);
|
2019-04-25 05:46:48 +08:00
|
|
|
fattr->uid = make_kuid(userns, be32_to_cpup(p++));
|
2013-02-01 19:45:54 +08:00
|
|
|
if (!uid_valid(fattr->uid))
|
|
|
|
goto out_uid;
|
2019-04-25 05:46:48 +08:00
|
|
|
fattr->gid = make_kgid(userns, be32_to_cpup(p++));
|
2013-02-01 19:45:54 +08:00
|
|
|
if (!gid_valid(fattr->gid))
|
|
|
|
goto out_gid;
|
|
|
|
|
2010-12-14 22:55:30 +08:00
|
|
|
fattr->size = be32_to_cpup(p++);
|
|
|
|
fattr->du.nfs2.blocksize = be32_to_cpup(p++);
|
|
|
|
|
|
|
|
rdev = be32_to_cpup(p++);
|
|
|
|
fattr->rdev = new_decode_dev(rdev);
|
|
|
|
if (type == (u32)NFCHR && rdev == (u32)NFS2_FIFO_DEV) {
|
|
|
|
fattr->mode = (fattr->mode & ~S_IFMT) | S_IFIFO;
|
|
|
|
fattr->rdev = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
fattr->du.nfs2.blocks = be32_to_cpup(p++);
|
|
|
|
fattr->fsid.major = be32_to_cpup(p++);
|
|
|
|
fattr->fsid.minor = 0;
|
|
|
|
fattr->fileid = be32_to_cpup(p++);
|
|
|
|
|
|
|
|
p = xdr_decode_time(p, &fattr->atime);
|
|
|
|
p = xdr_decode_time(p, &fattr->mtime);
|
|
|
|
xdr_decode_time(p, &fattr->ctime);
|
2012-04-28 01:48:18 +08:00
|
|
|
fattr->change_attr = nfs_timespec_to_change_attr(&fattr->ctime);
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
return 0;
|
2013-02-01 19:45:54 +08:00
|
|
|
out_uid:
|
|
|
|
dprintk("NFS: returned invalid uid\n");
|
|
|
|
return -EINVAL;
|
|
|
|
out_gid:
|
|
|
|
dprintk("NFS: returned invalid gid\n");
|
|
|
|
return -EINVAL;
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:30 +08:00
|
|
|
/*
|
|
|
|
* 2.3.6. sattr
|
|
|
|
*
|
|
|
|
* struct sattr {
|
|
|
|
* unsigned int mode;
|
|
|
|
* unsigned int uid;
|
|
|
|
* unsigned int gid;
|
|
|
|
* unsigned int size;
|
|
|
|
* timeval atime;
|
|
|
|
* timeval mtime;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define NFS2_SATTR_NOT_SET (0xffffffff)
|
|
|
|
|
|
|
|
static __be32 *xdr_time_not_set(__be32 *p)
|
|
|
|
{
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2019-04-25 05:46:48 +08:00
|
|
|
static void encode_sattr(struct xdr_stream *xdr, const struct iattr *attr,
|
|
|
|
struct user_namespace *userns)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, NFS_sattr_sz << 2);
|
|
|
|
|
|
|
|
if (attr->ia_valid & ATTR_MODE)
|
|
|
|
*p++ = cpu_to_be32(attr->ia_mode);
|
|
|
|
else
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
if (attr->ia_valid & ATTR_UID)
|
2019-04-25 05:46:48 +08:00
|
|
|
*p++ = cpu_to_be32(from_kuid_munged(userns, attr->ia_uid));
|
2010-12-14 22:54:30 +08:00
|
|
|
else
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
if (attr->ia_valid & ATTR_GID)
|
2019-04-25 05:46:48 +08:00
|
|
|
*p++ = cpu_to_be32(from_kgid_munged(userns, attr->ia_gid));
|
2010-12-14 22:54:30 +08:00
|
|
|
else
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
if (attr->ia_valid & ATTR_SIZE)
|
|
|
|
*p++ = cpu_to_be32((u32)attr->ia_size);
|
|
|
|
else
|
|
|
|
*p++ = cpu_to_be32(NFS2_SATTR_NOT_SET);
|
|
|
|
|
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
|
|
|
if (attr->ia_valid & ATTR_ATIME_SET) {
|
2019-10-05 04:57:45 +08:00
|
|
|
p = xdr_encode_time(p, &attr->ia_atime);
|
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
|
|
|
} else if (attr->ia_valid & ATTR_ATIME) {
|
2019-10-05 04:57:45 +08:00
|
|
|
p = xdr_encode_current_server_time(p, &attr->ia_atime);
|
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
|
|
|
} else
|
2010-12-14 22:54:30 +08:00
|
|
|
p = xdr_time_not_set(p);
|
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
|
|
|
if (attr->ia_valid & ATTR_MTIME_SET) {
|
2019-10-05 04:57:45 +08:00
|
|
|
xdr_encode_time(p, &attr->ia_mtime);
|
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
|
|
|
} else if (attr->ia_valid & ATTR_MTIME) {
|
2019-10-05 04:57:45 +08:00
|
|
|
xdr_encode_current_server_time(p, &attr->ia_mtime);
|
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
|
|
|
} else
|
2010-12-14 22:54:30 +08:00
|
|
|
xdr_time_not_set(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.3.7. filename
|
|
|
|
*
|
|
|
|
* typedef string filename<MAXNAMLEN>;
|
|
|
|
*/
|
|
|
|
static void encode_filename(struct xdr_stream *xdr,
|
|
|
|
const char *name, u32 length)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
2012-10-15 23:51:21 +08:00
|
|
|
WARN_ON_ONCE(length > NFS2_MAXNAMLEN);
|
2010-12-14 22:54:30 +08:00
|
|
|
p = xdr_reserve_space(xdr, 4 + length);
|
|
|
|
xdr_encode_opaque(p, name, length);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
static int decode_filename_inline(struct xdr_stream *xdr,
|
|
|
|
const char **name, u32 *length)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
u32 count;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
count = be32_to_cpup(p);
|
|
|
|
if (count > NFS3_MAXNAMLEN)
|
|
|
|
goto out_nametoolong;
|
|
|
|
p = xdr_inline_decode(xdr, count);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
*name = (const char *)p;
|
|
|
|
*length = count;
|
|
|
|
return 0;
|
|
|
|
out_nametoolong:
|
|
|
|
dprintk("NFS: returned filename too long: %u\n", count);
|
|
|
|
return -ENAMETOOLONG;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:30 +08:00
|
|
|
/*
|
|
|
|
* 2.3.8. path
|
|
|
|
*
|
|
|
|
* typedef string path<MAXPATHLEN>;
|
|
|
|
*/
|
|
|
|
static void encode_path(struct xdr_stream *xdr, struct page **pages, u32 length)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4);
|
|
|
|
*p = cpu_to_be32(length);
|
|
|
|
xdr_write_pages(xdr, pages, 0, length);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
static int decode_path(struct xdr_stream *xdr)
|
|
|
|
{
|
|
|
|
u32 length, recvd;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
length = be32_to_cpup(p);
|
|
|
|
if (unlikely(length >= xdr->buf->page_len || length > NFS_MAXPATHLEN))
|
|
|
|
goto out_size;
|
2012-06-21 10:35:05 +08:00
|
|
|
recvd = xdr_read_pages(xdr, length);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(length > recvd))
|
|
|
|
goto out_cheating;
|
|
|
|
xdr_terminate_string(xdr->buf, length);
|
|
|
|
return 0;
|
|
|
|
out_size:
|
|
|
|
dprintk("NFS: returned pathname too long: %u\n", length);
|
|
|
|
return -ENAMETOOLONG;
|
|
|
|
out_cheating:
|
|
|
|
dprintk("NFS: server cheating in pathname result: "
|
|
|
|
"length %u > received %u\n", length, recvd);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.3.9. attrstat
|
|
|
|
*
|
|
|
|
* union attrstat switch (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* fattr attributes;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*/
|
2014-08-27 10:47:14 +08:00
|
|
|
static int decode_attrstat(struct xdr_stream *xdr, struct nfs_fattr *result,
|
2019-04-25 05:46:48 +08:00
|
|
|
__u32 *op_status,
|
|
|
|
struct user_namespace *userns)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
error = decode_stat(xdr, &status);
|
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
2014-08-27 10:47:14 +08:00
|
|
|
if (op_status)
|
|
|
|
*op_status = status;
|
2010-12-14 22:55:10 +08:00
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2019-04-25 05:46:48 +08:00
|
|
|
error = decode_fattr(xdr, result, userns);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:30 +08:00
|
|
|
/*
|
|
|
|
* 2.3.10. diropargs
|
|
|
|
*
|
|
|
|
* struct diropargs {
|
|
|
|
* fhandle dir;
|
|
|
|
* filename name;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static void encode_diropargs(struct xdr_stream *xdr, const struct nfs_fh *fh,
|
|
|
|
const char *name, u32 length)
|
|
|
|
{
|
|
|
|
encode_fhandle(xdr, fh);
|
|
|
|
encode_filename(xdr, name, length);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
/*
|
|
|
|
* 2.3.11. diropres
|
|
|
|
*
|
|
|
|
* union diropres switch (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* struct {
|
|
|
|
* fhandle file;
|
|
|
|
* fattr attributes;
|
|
|
|
* } diropok;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*/
|
2019-04-25 05:46:48 +08:00
|
|
|
static int decode_diropok(struct xdr_stream *xdr, struct nfs_diropok *result,
|
|
|
|
struct user_namespace *userns)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
|
|
|
error = decode_fhandle(xdr, result->fh);
|
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
2019-04-25 05:46:48 +08:00
|
|
|
error = decode_fattr(xdr, result->fattr, userns);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2019-04-25 05:46:48 +08:00
|
|
|
static int decode_diropres(struct xdr_stream *xdr, struct nfs_diropok *result,
|
|
|
|
struct user_namespace *userns)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
error = decode_stat(xdr, &status);
|
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2019-04-25 05:46:48 +08:00
|
|
|
error = decode_diropok(xdr, result, userns);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:54:30 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2010-12-14 22:54:40 +08:00
|
|
|
* NFSv2 XDR encode functions
|
|
|
|
*
|
|
|
|
* NFSv2 argument types are defined in section 2.2 of RFC 1094:
|
|
|
|
* "NFS: Network File System Protocol Specification".
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_fhandle(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_fh *fh = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_fhandle(xdr, fh);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.3. sattrargs
|
|
|
|
*
|
|
|
|
* struct sattrargs {
|
|
|
|
* fhandle file;
|
|
|
|
* sattr attributes;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_sattrargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_sattrargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_fhandle(xdr, args->fh);
|
2019-04-25 05:46:48 +08:00
|
|
|
encode_sattr(xdr, args->sattr, rpc_rqst_userns(req));
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_diropargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_diropargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_diropargs(xdr, args->fh, args->name, args->len);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_readlinkargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_readlinkargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_fhandle(xdr, args->fh);
|
2019-02-12 00:25:20 +08:00
|
|
|
rpc_prepare_reply_pages(req, args->pages, args->pgbase,
|
|
|
|
args->pglen, NFS_readlinkres_sz);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.7. readargs
|
|
|
|
*
|
|
|
|
* struct readargs {
|
|
|
|
* fhandle file;
|
|
|
|
* unsigned offset;
|
|
|
|
* unsigned count;
|
|
|
|
* unsigned totalcount;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static void encode_readargs(struct xdr_stream *xdr,
|
2014-05-06 21:12:24 +08:00
|
|
|
const struct nfs_pgio_args *args)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
|
|
|
u32 offset = args->offset;
|
|
|
|
u32 count = args->count;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
encode_fhandle(xdr, args->fh);
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 4 + 4);
|
|
|
|
*p++ = cpu_to_be32(offset);
|
|
|
|
*p++ = cpu_to_be32(count);
|
|
|
|
*p = cpu_to_be32(count);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_readargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_pgio_args *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_readargs(xdr, args);
|
2019-02-12 00:25:20 +08:00
|
|
|
rpc_prepare_reply_pages(req, args->pages, args->pgbase,
|
|
|
|
args->count, NFS_readres_sz);
|
2010-12-14 22:54:30 +08:00
|
|
|
req->rq_rcv_buf.flags |= XDRBUF_READ;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.9. writeargs
|
|
|
|
*
|
|
|
|
* struct writeargs {
|
|
|
|
* fhandle file;
|
|
|
|
* unsigned beginoffset;
|
|
|
|
* unsigned offset;
|
|
|
|
* unsigned totalcount;
|
|
|
|
* nfsdata data;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static void encode_writeargs(struct xdr_stream *xdr,
|
2014-05-06 21:12:24 +08:00
|
|
|
const struct nfs_pgio_args *args)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
|
|
|
u32 offset = args->offset;
|
|
|
|
u32 count = args->count;
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
encode_fhandle(xdr, args->fh);
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 4 + 4 + 4);
|
|
|
|
*p++ = cpu_to_be32(offset);
|
|
|
|
*p++ = cpu_to_be32(offset);
|
|
|
|
*p++ = cpu_to_be32(count);
|
|
|
|
|
|
|
|
/* nfsdata */
|
|
|
|
*p = cpu_to_be32(count);
|
|
|
|
xdr_write_pages(xdr, args->pages, args->pgbase, count);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_writeargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_pgio_args *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_writeargs(xdr, args);
|
|
|
|
xdr->buf->flags |= XDRBUF_WRITE;
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.10. createargs
|
|
|
|
*
|
|
|
|
* struct createargs {
|
|
|
|
* diropargs where;
|
|
|
|
* sattr attributes;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_createargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_createargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_diropargs(xdr, args->fh, args->name, args->len);
|
2019-04-25 05:46:48 +08:00
|
|
|
encode_sattr(xdr, args->sattr, rpc_rqst_userns(req));
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_removeargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_removeargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_diropargs(xdr, args->fh, args->name.name, args->name.len);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.12. renameargs
|
|
|
|
*
|
|
|
|
* struct renameargs {
|
|
|
|
* diropargs from;
|
|
|
|
* diropargs to;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_renameargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_renameargs *args = data;
|
2010-12-14 22:54:30 +08:00
|
|
|
const struct qstr *old = args->old_name;
|
|
|
|
const struct qstr *new = args->new_name;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_diropargs(xdr, args->old_dir, old->name, old->len);
|
|
|
|
encode_diropargs(xdr, args->new_dir, new->name, new->len);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.13. linkargs
|
|
|
|
*
|
|
|
|
* struct linkargs {
|
|
|
|
* fhandle from;
|
|
|
|
* diropargs to;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_linkargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_linkargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_fhandle(xdr, args->fromfh);
|
|
|
|
encode_diropargs(xdr, args->tofh, args->toname, args->tolen);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.14. symlinkargs
|
|
|
|
*
|
|
|
|
* struct symlinkargs {
|
|
|
|
* diropargs from;
|
|
|
|
* path to;
|
|
|
|
* sattr attributes;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_symlinkargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_symlinkargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_diropargs(xdr, args->fromfh, args->fromname, args->fromlen);
|
|
|
|
encode_path(xdr, args->pages, args->pathlen);
|
2019-04-25 05:46:48 +08:00
|
|
|
encode_sattr(xdr, args->sattr, rpc_rqst_userns(req));
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.17. readdirargs
|
|
|
|
*
|
|
|
|
* struct readdirargs {
|
|
|
|
* fhandle dir;
|
|
|
|
* nfscookie cookie;
|
|
|
|
* unsigned count;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static void encode_readdirargs(struct xdr_stream *xdr,
|
|
|
|
const struct nfs_readdirargs *args)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
encode_fhandle(xdr, args->fh);
|
|
|
|
|
|
|
|
p = xdr_reserve_space(xdr, 4 + 4);
|
|
|
|
*p++ = cpu_to_be32(args->cookie);
|
|
|
|
*p = cpu_to_be32(args->count);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
static void nfs2_xdr_enc_readdirargs(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr,
|
2017-05-08 16:01:49 +08:00
|
|
|
const void *data)
|
2010-12-14 22:54:30 +08:00
|
|
|
{
|
2017-05-08 16:01:49 +08:00
|
|
|
const struct nfs_readdirargs *args = data;
|
|
|
|
|
2010-12-14 22:59:18 +08:00
|
|
|
encode_readdirargs(xdr, args);
|
2019-02-12 00:25:20 +08:00
|
|
|
rpc_prepare_reply_pages(req, args->pages, 0,
|
|
|
|
args->count, NFS_readdirres_sz);
|
2010-12-14 22:54:30 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2010-12-14 22:55:20 +08:00
|
|
|
* NFSv2 XDR decode functions
|
|
|
|
*
|
|
|
|
* NFSv2 result types are defined in section 2.2 of RFC 1094:
|
|
|
|
* "NFS: Network File System Protocol Specification".
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_stat(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2010-12-14 22:55:10 +08:00
|
|
|
void *__unused)
|
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_stat(xdr, &status);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_attrstat(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2017-05-08 21:09:02 +08:00
|
|
|
void *result)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
2019-04-25 05:46:48 +08:00
|
|
|
return decode_attrstat(xdr, result, NULL, rpc_rqst_userns(req));
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2017-05-08 21:09:02 +08:00
|
|
|
void *result)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
2019-04-25 05:46:48 +08:00
|
|
|
return decode_diropres(xdr, result, rpc_rqst_userns(req));
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.6. readlinkres
|
|
|
|
*
|
|
|
|
* union readlinkres switch (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* path data;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_readlinkres(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr, void *__unused)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_stat(xdr, &status);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_path(xdr);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.7. readres
|
|
|
|
*
|
|
|
|
* union readres switch (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* fattr attributes;
|
|
|
|
* nfsdata data;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_readres(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2017-05-08 21:09:02 +08:00
|
|
|
void *data)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
2017-05-08 21:09:02 +08:00
|
|
|
struct nfs_pgio_res *result = data;
|
2010-12-14 22:55:10 +08:00
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_stat(xdr, &status);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
2014-08-27 10:47:14 +08:00
|
|
|
result->op_status = status;
|
2010-12-14 22:55:10 +08:00
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2019-04-25 05:46:48 +08:00
|
|
|
error = decode_fattr(xdr, result->fattr, rpc_rqst_userns(req));
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_nfsdata(xdr, result);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_writeres(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2017-05-08 21:09:02 +08:00
|
|
|
void *data)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
2017-05-08 21:09:02 +08:00
|
|
|
struct nfs_pgio_res *result = data;
|
|
|
|
|
2010-12-14 22:55:10 +08:00
|
|
|
/* All NFSv2 writes are "file sync" writes */
|
|
|
|
result->verf->committed = NFS_FILE_SYNC;
|
2019-04-25 05:46:48 +08:00
|
|
|
return decode_attrstat(xdr, result->fattr, &result->op_status,
|
|
|
|
rpc_rqst_userns(req));
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* nfs2_decode_dirent - Decode a single NFSv2 directory entry stored in
|
|
|
|
* the local page cache.
|
|
|
|
* @xdr: XDR stream where entry resides
|
|
|
|
* @entry: buffer to fill in with entry data
|
|
|
|
* @plus: boolean indicating whether this should be a readdirplus entry
|
|
|
|
*
|
2010-12-14 22:58:11 +08:00
|
|
|
* Returns zero if successful, otherwise a negative errno value is
|
|
|
|
* returned.
|
2010-12-14 22:55:10 +08:00
|
|
|
*
|
|
|
|
* This function is not invoked during READDIR reply decoding, but
|
|
|
|
* rather whenever an application invokes the getdents(2) system call
|
|
|
|
* on a directory already in our cache.
|
|
|
|
*
|
|
|
|
* 2.2.17. entry
|
|
|
|
*
|
|
|
|
* struct entry {
|
|
|
|
* unsigned fileid;
|
|
|
|
* filename name;
|
|
|
|
* nfscookie cookie;
|
|
|
|
* entry *nextentry;
|
|
|
|
* };
|
|
|
|
*/
|
2010-12-14 22:58:11 +08:00
|
|
|
int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
|
2017-06-20 20:33:44 +08:00
|
|
|
bool plus)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EAGAIN;
|
2010-12-14 22:55:10 +08:00
|
|
|
if (*p++ == xdr_zero) {
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EAGAIN;
|
2010-12-14 22:55:10 +08:00
|
|
|
if (*p++ == xdr_zero)
|
2010-12-14 22:58:11 +08:00
|
|
|
return -EAGAIN;
|
2010-12-14 22:55:10 +08:00
|
|
|
entry->eof = 1;
|
2010-12-14 22:58:11 +08:00
|
|
|
return -EBADCOOKIE;
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EAGAIN;
|
2010-12-14 22:55:10 +08:00
|
|
|
entry->ino = be32_to_cpup(p);
|
|
|
|
|
|
|
|
error = decode_filename_inline(xdr, &entry->name, &entry->len);
|
|
|
|
if (unlikely(error))
|
2010-12-14 22:58:11 +08:00
|
|
|
return error;
|
2010-12-14 22:55:10 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The type (size and byte order) of nfscookie isn't defined in
|
|
|
|
* RFC 1094. This implementation assumes that it's an XDR uint32.
|
|
|
|
*/
|
|
|
|
entry->prev_cookie = entry->cookie;
|
|
|
|
p = xdr_inline_decode(xdr, 4);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EAGAIN;
|
2010-12-14 22:55:10 +08:00
|
|
|
entry->cookie = be32_to_cpup(p);
|
|
|
|
|
|
|
|
entry->d_type = DT_UNKNOWN;
|
|
|
|
|
2010-12-14 22:58:11 +08:00
|
|
|
return 0;
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.17. readdirres
|
|
|
|
*
|
|
|
|
* union readdirres switch (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* struct {
|
|
|
|
* entry *entries;
|
|
|
|
* bool eof;
|
|
|
|
* } readdirok;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
* Read the directory contents into the page cache, but don't
|
|
|
|
* touch them. The actual decoding is done by nfs2_decode_dirent()
|
|
|
|
* during subsequent nfs_readdir() calls.
|
|
|
|
*/
|
|
|
|
static int decode_readdirok(struct xdr_stream *xdr)
|
|
|
|
{
|
2012-06-21 10:35:05 +08:00
|
|
|
return xdr_read_pages(xdr, xdr->buf->page_len);
|
2010-12-14 22:55:10 +08:00
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_readdirres(struct rpc_rqst *req,
|
|
|
|
struct xdr_stream *xdr, void *__unused)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_stat(xdr, &status);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_readdirok(xdr);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 2.2.18. statfsres
|
|
|
|
*
|
|
|
|
* union statfsres (stat status) {
|
|
|
|
* case NFS_OK:
|
|
|
|
* struct {
|
|
|
|
* unsigned tsize;
|
|
|
|
* unsigned bsize;
|
|
|
|
* unsigned blocks;
|
|
|
|
* unsigned bfree;
|
|
|
|
* unsigned bavail;
|
|
|
|
* } info;
|
|
|
|
* default:
|
|
|
|
* void;
|
|
|
|
* };
|
|
|
|
*/
|
|
|
|
static int decode_info(struct xdr_stream *xdr, struct nfs2_fsstat *result)
|
|
|
|
{
|
|
|
|
__be32 *p;
|
|
|
|
|
|
|
|
p = xdr_inline_decode(xdr, NFS_info_sz << 2);
|
2019-02-12 00:24:21 +08:00
|
|
|
if (unlikely(!p))
|
|
|
|
return -EIO;
|
2010-12-14 22:55:10 +08:00
|
|
|
result->tsize = be32_to_cpup(p++);
|
|
|
|
result->bsize = be32_to_cpup(p++);
|
|
|
|
result->blocks = be32_to_cpup(p++);
|
|
|
|
result->bfree = be32_to_cpup(p++);
|
|
|
|
result->bavail = be32_to_cpup(p);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
static int nfs2_xdr_dec_statfsres(struct rpc_rqst *req, struct xdr_stream *xdr,
|
2017-05-08 21:09:02 +08:00
|
|
|
void *result)
|
2010-12-14 22:55:10 +08:00
|
|
|
{
|
|
|
|
enum nfs_stat status;
|
|
|
|
int error;
|
|
|
|
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_stat(xdr, &status);
|
2010-12-14 22:55:10 +08:00
|
|
|
if (unlikely(error))
|
|
|
|
goto out;
|
|
|
|
if (status != NFS_OK)
|
|
|
|
goto out_default;
|
2010-12-14 22:59:29 +08:00
|
|
|
error = decode_info(xdr, result);
|
2010-12-14 22:55:10 +08:00
|
|
|
out:
|
|
|
|
return error;
|
|
|
|
out_default:
|
|
|
|
return nfs_stat_to_errno(status);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* We need to translate between nfs status return values and
|
|
|
|
* the local errno values which may not be the same.
|
|
|
|
*/
|
2010-12-14 22:55:00 +08:00
|
|
|
static const struct {
|
2005-04-17 06:20:36 +08:00
|
|
|
int stat;
|
|
|
|
int errno;
|
|
|
|
} nfs_errtbl[] = {
|
|
|
|
{ NFS_OK, 0 },
|
2008-03-31 22:39:06 +08:00
|
|
|
{ NFSERR_PERM, -EPERM },
|
|
|
|
{ NFSERR_NOENT, -ENOENT },
|
|
|
|
{ NFSERR_IO, -errno_NFSERR_IO},
|
|
|
|
{ NFSERR_NXIO, -ENXIO },
|
|
|
|
/* { NFSERR_EAGAIN, -EAGAIN }, */
|
|
|
|
{ NFSERR_ACCES, -EACCES },
|
|
|
|
{ NFSERR_EXIST, -EEXIST },
|
|
|
|
{ NFSERR_XDEV, -EXDEV },
|
|
|
|
{ NFSERR_NODEV, -ENODEV },
|
|
|
|
{ NFSERR_NOTDIR, -ENOTDIR },
|
|
|
|
{ NFSERR_ISDIR, -EISDIR },
|
|
|
|
{ NFSERR_INVAL, -EINVAL },
|
|
|
|
{ NFSERR_FBIG, -EFBIG },
|
|
|
|
{ NFSERR_NOSPC, -ENOSPC },
|
|
|
|
{ NFSERR_ROFS, -EROFS },
|
|
|
|
{ NFSERR_MLINK, -EMLINK },
|
|
|
|
{ NFSERR_NAMETOOLONG, -ENAMETOOLONG },
|
|
|
|
{ NFSERR_NOTEMPTY, -ENOTEMPTY },
|
|
|
|
{ NFSERR_DQUOT, -EDQUOT },
|
|
|
|
{ NFSERR_STALE, -ESTALE },
|
|
|
|
{ NFSERR_REMOTE, -EREMOTE },
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef EWFLUSH
|
2008-03-31 22:39:06 +08:00
|
|
|
{ NFSERR_WFLUSH, -EWFLUSH },
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2008-03-31 22:39:06 +08:00
|
|
|
{ NFSERR_BADHANDLE, -EBADHANDLE },
|
|
|
|
{ NFSERR_NOT_SYNC, -ENOTSYNC },
|
|
|
|
{ NFSERR_BAD_COOKIE, -EBADCOOKIE },
|
|
|
|
{ NFSERR_NOTSUPP, -ENOTSUPP },
|
|
|
|
{ NFSERR_TOOSMALL, -ETOOSMALL },
|
2010-02-08 22:32:40 +08:00
|
|
|
{ NFSERR_SERVERFAULT, -EREMOTEIO },
|
2008-03-31 22:39:06 +08:00
|
|
|
{ NFSERR_BADTYPE, -EBADTYPE },
|
|
|
|
{ NFSERR_JUKEBOX, -EJUKEBOX },
|
|
|
|
{ -1, -EIO }
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2010-12-14 22:55:00 +08:00
|
|
|
/**
|
|
|
|
* nfs_stat_to_errno - convert an NFS status code to a local errno
|
|
|
|
* @status: NFS status code to convert
|
|
|
|
*
|
|
|
|
* Returns a local errno value, or -EIO if the NFS status code is
|
|
|
|
* not recognized. This function is used jointly by NFSv2 and NFSv3.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2012-05-11 04:47:18 +08:00
|
|
|
static int nfs_stat_to_errno(enum nfs_stat status)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; nfs_errtbl[i].stat != -1; i++) {
|
2010-12-14 22:55:00 +08:00
|
|
|
if (nfs_errtbl[i].stat == (int)status)
|
2005-04-17 06:20:36 +08:00
|
|
|
return nfs_errtbl[i].errno;
|
|
|
|
}
|
2010-12-14 22:55:00 +08:00
|
|
|
dprintk("NFS: Unrecognized nfs status value: %u\n", status);
|
2005-04-17 06:20:36 +08:00
|
|
|
return nfs_errtbl[i].errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define PROC(proc, argtype, restype, timer) \
|
|
|
|
[NFSPROC_##proc] = { \
|
|
|
|
.p_proc = NFSPROC_##proc, \
|
2017-05-08 16:01:49 +08:00
|
|
|
.p_encode = nfs2_xdr_enc_##argtype, \
|
2017-05-08 21:09:02 +08:00
|
|
|
.p_decode = nfs2_xdr_dec_##restype, \
|
2007-03-30 04:47:53 +08:00
|
|
|
.p_arglen = NFS_##argtype##_sz, \
|
|
|
|
.p_replen = NFS_##restype##_sz, \
|
2006-03-21 02:44:22 +08:00
|
|
|
.p_timer = timer, \
|
|
|
|
.p_statidx = NFSPROC_##proc, \
|
|
|
|
.p_name = #proc, \
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2017-05-12 21:36:49 +08:00
|
|
|
const struct rpc_procinfo nfs_procedures[] = {
|
2010-12-14 22:57:42 +08:00
|
|
|
PROC(GETATTR, fhandle, attrstat, 1),
|
|
|
|
PROC(SETATTR, sattrargs, attrstat, 0),
|
|
|
|
PROC(LOOKUP, diropargs, diropres, 2),
|
|
|
|
PROC(READLINK, readlinkargs, readlinkres, 3),
|
|
|
|
PROC(READ, readargs, readres, 3),
|
|
|
|
PROC(WRITE, writeargs, writeres, 4),
|
|
|
|
PROC(CREATE, createargs, diropres, 0),
|
|
|
|
PROC(REMOVE, removeargs, stat, 0),
|
|
|
|
PROC(RENAME, renameargs, stat, 0),
|
|
|
|
PROC(LINK, linkargs, stat, 0),
|
|
|
|
PROC(SYMLINK, symlinkargs, stat, 0),
|
|
|
|
PROC(MKDIR, createargs, diropres, 0),
|
|
|
|
PROC(RMDIR, diropargs, stat, 0),
|
|
|
|
PROC(READDIR, readdirargs, readdirres, 3),
|
|
|
|
PROC(STATFS, fhandle, statfsres, 0),
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2017-05-09 05:27:10 +08:00
|
|
|
static unsigned int nfs_version2_counts[ARRAY_SIZE(nfs_procedures)];
|
2012-01-21 02:53:56 +08:00
|
|
|
const struct rpc_version nfs_version2 = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.number = 2,
|
2006-03-24 19:15:34 +08:00
|
|
|
.nrprocs = ARRAY_SIZE(nfs_procedures),
|
2017-05-09 05:27:10 +08:00
|
|
|
.procs = nfs_procedures,
|
|
|
|
.counts = nfs_version2_counts,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|