License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 15:07:57 +01:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* XDR support for nfsd/protocol version 3.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
|
|
|
|
*
|
|
|
|
* 2003-08-09 Jamie Lokier: Use htonl() for nanoseconds, not htons()!
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/namei.h>
|
2012-12-06 12:23:19 +01:00
|
|
|
#include <linux/sunrpc/svc_xprt.h>
|
2009-12-03 19:30:56 +01:00
|
|
|
#include "xdr3.h"
|
2007-11-15 23:05:43 +01:00
|
|
|
#include "auth.h"
|
2012-12-06 12:23:19 +01:00
|
|
|
#include "netns.h"
|
2013-01-24 08:18:08 +01:00
|
|
|
#include "vfs.h"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
#define NFSDDBG_FACILITY NFSDDBG_XDR
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Mapping of S_IF* types to NFS file types
|
|
|
|
*/
|
|
|
|
static u32 nfs3_ftypes[] = {
|
|
|
|
NF3NON, NF3FIFO, NF3CHR, NF3BAD,
|
|
|
|
NF3DIR, NF3BAD, NF3BLK, NF3BAD,
|
|
|
|
NF3REG, NF3BAD, NF3LNK, NF3BAD,
|
|
|
|
NF3SOCK, NF3BAD, NF3LNK, NF3BAD,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR functions for basic NFS types
|
|
|
|
*/
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
encode_time3(__be32 *p, struct timespec *time)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
*p++ = htonl((u32) time->tv_sec); *p++ = htonl(time->tv_nsec);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
decode_time3(__be32 *p, struct timespec *time)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
time->tv_sec = ntohl(*p++);
|
|
|
|
time->tv_nsec = ntohl(*p++);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
decode_fh(__be32 *p, struct svc_fh *fhp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
unsigned int size;
|
|
|
|
fh_init(fhp, NFS3_FHSIZE);
|
|
|
|
size = ntohl(*p++);
|
|
|
|
if (size > NFS3_FHSIZE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
memcpy(&fhp->fh_handle.fh_base, p, size);
|
|
|
|
fhp->fh_handle.fh_size = size;
|
|
|
|
return p + XDR_QUADLEN(size);
|
|
|
|
}
|
|
|
|
|
2005-06-22 19:16:26 +02:00
|
|
|
/* Helper function for NFSv3 ACL code */
|
2006-10-20 08:28:57 +02:00
|
|
|
__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp)
|
2005-06-22 19:16:26 +02:00
|
|
|
{
|
|
|
|
return decode_fh(p, fhp);
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
encode_fh(__be32 *p, struct svc_fh *fhp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
unsigned int size = fhp->fh_handle.fh_size;
|
|
|
|
*p++ = htonl(size);
|
|
|
|
if (size) p[XDR_QUADLEN(size)-1]=0;
|
|
|
|
memcpy(p, &fhp->fh_handle.fh_base, size);
|
|
|
|
return p + XDR_QUADLEN(size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decode a file name and make sure that the path contains
|
|
|
|
* no slashes or null bytes.
|
|
|
|
*/
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2007-11-01 21:56:58 +01:00
|
|
|
decode_filename(__be32 *p, char **namp, unsigned int *lenp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
char *name;
|
2007-11-01 21:56:58 +01:00
|
|
|
unsigned int i;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS3_MAXNAMLEN)) != NULL) {
|
|
|
|
for (i = 0, name = *namp; i < *lenp; i++, name++) {
|
|
|
|
if (*name == '\0' || *name == '/')
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
decode_sattr3(__be32 *p, struct iattr *iap)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
u32 tmp;
|
|
|
|
|
|
|
|
iap->ia_valid = 0;
|
|
|
|
|
|
|
|
if (*p++) {
|
|
|
|
iap->ia_valid |= ATTR_MODE;
|
|
|
|
iap->ia_mode = ntohl(*p++);
|
|
|
|
}
|
|
|
|
if (*p++) {
|
2013-02-02 13:16:08 +01:00
|
|
|
iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++));
|
|
|
|
if (uid_valid(iap->ia_uid))
|
|
|
|
iap->ia_valid |= ATTR_UID;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
if (*p++) {
|
2013-02-02 13:16:08 +01:00
|
|
|
iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++));
|
|
|
|
if (gid_valid(iap->ia_gid))
|
|
|
|
iap->ia_valid |= ATTR_GID;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
if (*p++) {
|
|
|
|
u64 newsize;
|
|
|
|
|
|
|
|
iap->ia_valid |= ATTR_SIZE;
|
|
|
|
p = xdr_decode_hyper(p, &newsize);
|
2014-06-10 12:08:19 +02:00
|
|
|
iap->ia_size = min_t(u64, newsize, NFS_OFFSET_MAX);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
if ((tmp = ntohl(*p++)) == 1) { /* set to server time */
|
|
|
|
iap->ia_valid |= ATTR_ATIME;
|
|
|
|
} else if (tmp == 2) { /* set to client time */
|
|
|
|
iap->ia_valid |= ATTR_ATIME | ATTR_ATIME_SET;
|
|
|
|
iap->ia_atime.tv_sec = ntohl(*p++);
|
|
|
|
iap->ia_atime.tv_nsec = ntohl(*p++);
|
|
|
|
}
|
|
|
|
if ((tmp = ntohl(*p++)) == 1) { /* set to server time */
|
|
|
|
iap->ia_valid |= ATTR_MTIME;
|
|
|
|
} else if (tmp == 2) { /* set to client time */
|
|
|
|
iap->ia_valid |= ATTR_MTIME | ATTR_MTIME_SET;
|
|
|
|
iap->ia_mtime.tv_sec = ntohl(*p++);
|
|
|
|
iap->ia_mtime.tv_nsec = ntohl(*p++);
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2007-02-14 09:33:12 +01:00
|
|
|
static __be32 *encode_fsid(__be32 *p, struct svc_fh *fhp)
|
|
|
|
{
|
|
|
|
u64 f;
|
|
|
|
switch(fsid_source(fhp)) {
|
|
|
|
default:
|
|
|
|
case FSIDSOURCE_DEV:
|
|
|
|
p = xdr_encode_hyper(p, (u64)huge_encode_dev
|
2016-04-10 07:33:30 +02:00
|
|
|
(fhp->fh_dentry->d_sb->s_dev));
|
2007-02-14 09:33:12 +01:00
|
|
|
break;
|
|
|
|
case FSIDSOURCE_FSID:
|
|
|
|
p = xdr_encode_hyper(p, (u64) fhp->fh_export->ex_fsid);
|
|
|
|
break;
|
|
|
|
case FSIDSOURCE_UUID:
|
|
|
|
f = ((u64*)fhp->fh_export->ex_uuid)[0];
|
|
|
|
f ^= ((u64*)fhp->fh_export->ex_uuid)[1];
|
|
|
|
p = xdr_encode_hyper(p, f);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
|
2006-01-06 09:19:58 +01:00
|
|
|
struct kstat *stat)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
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 04:36:02 +02:00
|
|
|
struct timespec ts;
|
2006-01-06 09:19:58 +01:00
|
|
|
*p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);
|
2013-11-18 18:18:01 +01:00
|
|
|
*p++ = htonl((u32) (stat->mode & S_IALLUGO));
|
2006-01-06 09:19:58 +01:00
|
|
|
*p++ = htonl((u32) stat->nlink);
|
2013-02-02 13:16:08 +01:00
|
|
|
*p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
|
|
|
|
*p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
|
2006-01-06 09:19:58 +01:00
|
|
|
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
|
2005-04-17 00:20:36 +02:00
|
|
|
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
|
|
|
|
} else {
|
2006-01-06 09:19:58 +01:00
|
|
|
p = xdr_encode_hyper(p, (u64) stat->size);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2006-01-06 09:19:58 +01:00
|
|
|
p = xdr_encode_hyper(p, ((u64)stat->blocks) << 9);
|
|
|
|
*p++ = htonl((u32) MAJOR(stat->rdev));
|
|
|
|
*p++ = htonl((u32) MINOR(stat->rdev));
|
2007-02-14 09:33:12 +01:00
|
|
|
p = encode_fsid(p, fhp);
|
2007-08-16 18:10:07 +02:00
|
|
|
p = xdr_encode_hyper(p, stat->ino);
|
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 04:36:02 +02:00
|
|
|
ts = timespec64_to_timespec(stat->atime);
|
|
|
|
p = encode_time3(p, &ts);
|
|
|
|
ts = timespec64_to_timespec(stat->mtime);
|
|
|
|
p = encode_time3(p, &ts);
|
|
|
|
ts = timespec64_to_timespec(stat->ctime);
|
|
|
|
p = encode_time3(p, &ts);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
encode_saved_post_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
/* Attributes to follow */
|
|
|
|
*p++ = xdr_one;
|
2007-08-16 18:10:07 +02:00
|
|
|
return encode_fattr3(rqstp, p, fhp, &fhp->fh_post_attr);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Encode post-operation attributes.
|
|
|
|
* The inode may be NULL if the call failed because of a stale file
|
|
|
|
* handle. In this case, no attributes are returned.
|
|
|
|
*/
|
2006-10-20 08:28:57 +02:00
|
|
|
static __be32 *
|
|
|
|
encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct dentry *dentry = fhp->fh_dentry;
|
2015-03-17 23:25:59 +01:00
|
|
|
if (dentry && d_really_is_positive(dentry)) {
|
2013-01-24 08:18:08 +01:00
|
|
|
__be32 err;
|
2006-01-06 09:19:58 +01:00
|
|
|
struct kstat stat;
|
|
|
|
|
2013-01-24 08:18:08 +01:00
|
|
|
err = fh_getattr(fhp, &stat);
|
2006-01-06 09:19:58 +01:00
|
|
|
if (!err) {
|
|
|
|
*p++ = xdr_one; /* attributes follow */
|
2015-03-17 23:25:59 +01:00
|
|
|
lease_get_mtime(d_inode(dentry), &stat.mtime);
|
2006-01-06 09:19:58 +01:00
|
|
|
return encode_fattr3(rqstp, p, fhp, &stat);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
*p++ = xdr_zero;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2005-06-22 19:16:26 +02:00
|
|
|
/* Helper for NFSv3 ACLs */
|
2006-10-20 08:28:57 +02:00
|
|
|
__be32 *
|
|
|
|
nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
|
2005-06-22 19:16:26 +02:00
|
|
|
{
|
|
|
|
return encode_post_op_attr(rqstp, p, fhp);
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* Enocde weak cache consistency data
|
|
|
|
*/
|
2006-10-20 08:28:57 +02:00
|
|
|
static __be32 *
|
|
|
|
encode_wcc_data(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct dentry *dentry = fhp->fh_dentry;
|
|
|
|
|
2015-03-17 23:25:59 +01:00
|
|
|
if (dentry && d_really_is_positive(dentry) && fhp->fh_post_saved) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if (fhp->fh_pre_saved) {
|
|
|
|
*p++ = xdr_one;
|
|
|
|
p = xdr_encode_hyper(p, (u64) fhp->fh_pre_size);
|
|
|
|
p = encode_time3(p, &fhp->fh_pre_mtime);
|
|
|
|
p = encode_time3(p, &fhp->fh_pre_ctime);
|
|
|
|
} else {
|
|
|
|
*p++ = xdr_zero;
|
|
|
|
}
|
|
|
|
return encode_saved_post_attr(rqstp, p, fhp);
|
|
|
|
}
|
|
|
|
/* no pre- or post-attrs */
|
|
|
|
*p++ = xdr_zero;
|
|
|
|
return encode_post_op_attr(rqstp, p, fhp);
|
|
|
|
}
|
|
|
|
|
2018-01-03 16:14:35 +01:00
|
|
|
/*
|
|
|
|
* Fill in the pre_op attr for the wcc data
|
|
|
|
*/
|
|
|
|
void fill_pre_wcc(struct svc_fh *fhp)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
struct kstat stat;
|
|
|
|
__be32 err;
|
|
|
|
|
|
|
|
if (fhp->fh_pre_saved)
|
|
|
|
return;
|
|
|
|
|
|
|
|
inode = d_inode(fhp->fh_dentry);
|
|
|
|
err = fh_getattr(fhp, &stat);
|
|
|
|
if (err) {
|
|
|
|
/* Grab the times from inode anyway */
|
|
|
|
stat.mtime = inode->i_mtime;
|
|
|
|
stat.ctime = inode->i_ctime;
|
|
|
|
stat.size = inode->i_size;
|
|
|
|
}
|
|
|
|
|
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 04:36:02 +02:00
|
|
|
fhp->fh_pre_mtime = timespec64_to_timespec(stat.mtime);
|
|
|
|
fhp->fh_pre_ctime = timespec64_to_timespec(stat.ctime);
|
2018-01-03 16:14:35 +01:00
|
|
|
fhp->fh_pre_size = stat.size;
|
|
|
|
fhp->fh_pre_change = nfsd4_change_attribute(&stat, inode);
|
|
|
|
fhp->fh_pre_saved = true;
|
|
|
|
}
|
|
|
|
|
2007-08-16 18:10:07 +02:00
|
|
|
/*
|
|
|
|
* Fill in the post_op attr for the wcc data
|
|
|
|
*/
|
|
|
|
void fill_post_wcc(struct svc_fh *fhp)
|
|
|
|
{
|
2013-01-24 08:18:08 +01:00
|
|
|
__be32 err;
|
2007-08-16 18:10:07 +02:00
|
|
|
|
|
|
|
if (fhp->fh_post_saved)
|
|
|
|
printk("nfsd: inode locked twice during operation.\n");
|
|
|
|
|
2013-01-24 08:18:08 +01:00
|
|
|
err = fh_getattr(fhp, &fhp->fh_post_attr);
|
2018-01-03 16:14:35 +01:00
|
|
|
fhp->fh_post_change = nfsd4_change_attribute(&fhp->fh_post_attr,
|
|
|
|
d_inode(fhp->fh_dentry));
|
2010-12-02 01:14:30 +01:00
|
|
|
if (err) {
|
2015-09-17 14:28:39 +02:00
|
|
|
fhp->fh_post_saved = false;
|
2010-12-02 01:14:30 +01:00
|
|
|
/* Grab the ctime anyway - set_change_info might use it */
|
2015-03-17 23:25:59 +01:00
|
|
|
fhp->fh_post_attr.ctime = d_inode(fhp->fh_dentry)->i_ctime;
|
2010-12-02 01:14:30 +01:00
|
|
|
} else
|
2015-09-17 14:28:39 +02:00
|
|
|
fhp->fh_post_saved = true;
|
2007-08-16 18:10:07 +02:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR decode functions
|
|
|
|
*/
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd_fhandle *args = rqstp->rq_argp;
|
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_sattrargs *args = rqstp->rq_argp;
|
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2007-05-09 11:34:57 +02:00
|
|
|
p = decode_sattr3(p, &args->attrs);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if ((args->check_guard = ntohl(*p++)) != 0) {
|
|
|
|
struct timespec time;
|
|
|
|
p = decode_time3(p, &time);
|
|
|
|
args->guardtime = time.tv_sec;
|
|
|
|
}
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_diropargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(p = decode_fh(p, &args->fh))
|
|
|
|
|| !(p = decode_filename(p, &args->name, &args->len)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_accessargs *args = rqstp->rq_argp;
|
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
args->access = ntohl(*p++);
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_readargs *args = rqstp->rq_argp;
|
2005-04-17 00:20:36 +02:00
|
|
|
unsigned int len;
|
2012-12-11 00:01:37 +01:00
|
|
|
int v;
|
2006-10-04 11:15:47 +02:00
|
|
|
u32 max_blocksize = svc_max_payload(rqstp);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2007-05-09 11:34:57 +02:00
|
|
|
p = xdr_decode_hyper(p, &args->offset);
|
2017-04-07 04:36:31 +02:00
|
|
|
|
2017-05-16 21:57:42 +02:00
|
|
|
args->count = ntohl(*p++);
|
2014-06-10 12:08:19 +02:00
|
|
|
len = min(args->count, max_blocksize);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* set up the kvec */
|
|
|
|
v=0;
|
|
|
|
while (len > 0) {
|
2012-12-11 00:01:37 +01:00
|
|
|
struct page *p = *(rqstp->rq_next_page++);
|
|
|
|
|
|
|
|
rqstp->rq_vec[v].iov_base = page_address(p);
|
2014-06-10 12:08:19 +02:00
|
|
|
rqstp->rq_vec[v].iov_len = min_t(unsigned int, len, PAGE_SIZE);
|
2006-10-04 11:15:47 +02:00
|
|
|
len -= rqstp->rq_vec[v].iov_len;
|
2005-04-17 00:20:36 +02:00
|
|
|
v++;
|
|
|
|
}
|
|
|
|
args->vlen = v;
|
2017-05-16 21:57:42 +02:00
|
|
|
return xdr_argsize_check(rqstp, p);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_writeargs *args = rqstp->rq_argp;
|
2018-03-27 16:54:07 +02:00
|
|
|
unsigned int len, hdr, dlen;
|
2006-10-04 11:15:47 +02:00
|
|
|
u32 max_blocksize = svc_max_payload(rqstp);
|
2017-04-25 22:21:34 +02:00
|
|
|
struct kvec *head = rqstp->rq_arg.head;
|
|
|
|
struct kvec *tail = rqstp->rq_arg.tail;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2007-05-09 11:34:57 +02:00
|
|
|
p = xdr_decode_hyper(p, &args->offset);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
args->count = ntohl(*p++);
|
|
|
|
args->stable = ntohl(*p++);
|
|
|
|
len = args->len = ntohl(*p++);
|
2017-04-21 21:26:30 +02:00
|
|
|
if ((void *)p > head->iov_base + head->iov_len)
|
|
|
|
return 0;
|
2007-05-09 11:34:48 +02:00
|
|
|
/*
|
|
|
|
* The count must equal the amount of data passed.
|
|
|
|
*/
|
|
|
|
if (args->count != args->len)
|
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-05-09 11:34:48 +02:00
|
|
|
/*
|
|
|
|
* Check to make sure that we got the right number of
|
|
|
|
* bytes.
|
|
|
|
*/
|
2017-04-25 22:21:34 +02:00
|
|
|
hdr = (void*)p - head->iov_base;
|
|
|
|
dlen = head->iov_len + rqstp->rq_arg.page_len + tail->iov_len - hdr;
|
2007-05-09 11:34:48 +02:00
|
|
|
/*
|
|
|
|
* Round the length of the data which was specified up to
|
|
|
|
* the next multiple of XDR units and then compare that
|
|
|
|
* against the length which was actually received.
|
2008-01-11 23:06:52 +01:00
|
|
|
* Note that when RPCSEC/GSS (for example) is used, the
|
|
|
|
* data buffer can be padded so dlen might be larger
|
|
|
|
* than required. It must never be smaller.
|
2007-05-09 11:34:48 +02:00
|
|
|
*/
|
2008-01-11 23:06:52 +01:00
|
|
|
if (dlen < XDR_QUADLEN(len)*4)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
|
2007-05-09 11:34:48 +02:00
|
|
|
if (args->count > max_blocksize) {
|
|
|
|
args->count = max_blocksize;
|
|
|
|
len = args->len = max_blocksize;
|
|
|
|
}
|
2018-03-27 16:54:07 +02:00
|
|
|
|
|
|
|
args->first.iov_base = (void *)p;
|
|
|
|
args->first.iov_len = head->iov_len - hdr;
|
2007-05-09 11:34:48 +02:00
|
|
|
return 1;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_createargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_createargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(p = decode_fh(p, &args->fh))
|
|
|
|
|| !(p = decode_filename(p, &args->name, &args->len)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (args->createmode = ntohl(*p++)) {
|
|
|
|
case NFS3_CREATE_UNCHECKED:
|
|
|
|
case NFS3_CREATE_GUARDED:
|
2007-05-09 11:34:57 +02:00
|
|
|
p = decode_sattr3(p, &args->attrs);
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
case NFS3_CREATE_EXCLUSIVE:
|
|
|
|
args->verf = p;
|
|
|
|
p += 2;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
2017-05-08 19:01:48 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_mkdirargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_createargs *args = rqstp->rq_argp;
|
|
|
|
|
2007-05-09 11:34:57 +02:00
|
|
|
if (!(p = decode_fh(p, &args->fh)) ||
|
|
|
|
!(p = decode_filename(p, &args->name, &args->len)))
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2007-05-09 11:34:57 +02:00
|
|
|
p = decode_sattr3(p, &args->attrs);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_symlinkargs *args = rqstp->rq_argp;
|
2018-03-27 16:54:21 +02:00
|
|
|
char *base = (char *)p;
|
|
|
|
size_t dlen;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-05-09 11:34:57 +02:00
|
|
|
if (!(p = decode_fh(p, &args->ffh)) ||
|
2018-03-27 16:54:21 +02:00
|
|
|
!(p = decode_filename(p, &args->fname, &args->flen)))
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2007-05-09 11:34:57 +02:00
|
|
|
p = decode_sattr3(p, &args->attrs);
|
|
|
|
|
2018-03-27 16:54:21 +02:00
|
|
|
args->tlen = ntohl(*p++);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2018-03-27 16:54:21 +02:00
|
|
|
args->first.iov_base = p;
|
|
|
|
args->first.iov_len = rqstp->rq_arg.head[0].iov_len;
|
|
|
|
args->first.iov_len -= (char *)p - base;
|
|
|
|
|
|
|
|
dlen = args->first.iov_len + rqstp->rq_arg.page_len +
|
|
|
|
rqstp->rq_arg.tail[0].iov_len;
|
|
|
|
if (dlen < XDR_QUADLEN(args->tlen) << 2)
|
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_mknodargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_mknodargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(p = decode_fh(p, &args->fh))
|
|
|
|
|| !(p = decode_filename(p, &args->name, &args->len)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
args->ftype = ntohl(*p++);
|
|
|
|
|
|
|
|
if (args->ftype == NF3BLK || args->ftype == NF3CHR
|
2007-05-09 11:34:57 +02:00
|
|
|
|| args->ftype == NF3SOCK || args->ftype == NF3FIFO)
|
|
|
|
p = decode_sattr3(p, &args->attrs);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (args->ftype == NF3BLK || args->ftype == NF3CHR) {
|
|
|
|
args->major = ntohl(*p++);
|
|
|
|
args->minor = ntohl(*p++);
|
|
|
|
}
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_renameargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_renameargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(p = decode_fh(p, &args->ffh))
|
|
|
|
|| !(p = decode_filename(p, &args->fname, &args->flen))
|
|
|
|
|| !(p = decode_fh(p, &args->tfh))
|
|
|
|
|| !(p = decode_filename(p, &args->tname, &args->tlen)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_readlinkargs *args = rqstp->rq_argp;
|
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
2012-12-11 00:01:37 +01:00
|
|
|
args->buffer = page_address(*(rqstp->rq_next_page++));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2017-05-16 21:57:42 +02:00
|
|
|
return xdr_argsize_check(rqstp, p);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_linkargs *args = rqstp->rq_argp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(p = decode_fh(p, &args->ffh))
|
|
|
|
|| !(p = decode_fh(p, &args->tfh))
|
|
|
|
|| !(p = decode_filename(p, &args->tname, &args->tlen)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_readdirargs *args = rqstp->rq_argp;
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
p = xdr_decode_hyper(p, &args->cookie);
|
|
|
|
args->verf = p; p += 2;
|
|
|
|
args->dircount = ~0;
|
|
|
|
args->count = ntohl(*p++);
|
2014-06-10 12:08:19 +02:00
|
|
|
args->count = min_t(u32, args->count, PAGE_SIZE);
|
2012-12-11 00:01:37 +01:00
|
|
|
args->buffer = page_address(*(rqstp->rq_next_page++));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2017-05-16 21:57:42 +02:00
|
|
|
return xdr_argsize_check(rqstp, p);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_readdirargs *args = rqstp->rq_argp;
|
2012-12-11 00:01:37 +01:00
|
|
|
int len;
|
2006-10-04 11:15:47 +02:00
|
|
|
u32 max_blocksize = svc_max_payload(rqstp);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
p = xdr_decode_hyper(p, &args->cookie);
|
|
|
|
args->verf = p; p += 2;
|
|
|
|
args->dircount = ntohl(*p++);
|
|
|
|
args->count = ntohl(*p++);
|
|
|
|
|
2014-06-10 12:08:19 +02:00
|
|
|
len = args->count = min(args->count, max_blocksize);
|
2005-04-17 00:20:36 +02:00
|
|
|
while (len > 0) {
|
2012-12-11 00:01:37 +01:00
|
|
|
struct page *p = *(rqstp->rq_next_page++);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!args->buffer)
|
2012-12-11 00:01:37 +01:00
|
|
|
args->buffer = page_address(p);
|
2005-04-17 00:20:36 +02:00
|
|
|
len -= PAGE_SIZE;
|
|
|
|
}
|
2017-05-16 21:57:42 +02:00
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-05-08 19:01:48 +02:00
|
|
|
nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:01:48 +02:00
|
|
|
struct nfsd3_commitargs *args = rqstp->rq_argp;
|
2014-05-22 16:32:30 +02:00
|
|
|
p = decode_fh(p, &args->fh);
|
|
|
|
if (!p)
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
p = xdr_decode_hyper(p, &args->offset);
|
|
|
|
args->count = ntohl(*p++);
|
|
|
|
|
|
|
|
return xdr_argsize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR encode functions
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* There must be an encoding function for void results so svc_process
|
|
|
|
* will work properly.
|
|
|
|
*/
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_voidres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* GETATTR */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_attrstat *resp = rqstp->rq_resp;
|
|
|
|
|
2007-08-16 18:10:07 +02:00
|
|
|
if (resp->status == 0) {
|
2015-03-17 23:25:59 +01:00
|
|
|
lease_get_mtime(d_inode(resp->fh.fh_dentry),
|
2007-08-16 18:10:07 +02:00
|
|
|
&resp->stat.mtime);
|
2006-01-06 09:19:58 +01:00
|
|
|
p = encode_fattr3(rqstp, p, &resp->fh, &resp->stat);
|
2007-08-16 18:10:07 +02:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* SETATTR, REMOVE, RMDIR */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_wccstat(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_attrstat *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_wcc_data(rqstp, p, &resp->fh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* LOOKUP */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_diropres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_diropres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (resp->status == 0) {
|
|
|
|
p = encode_fh(p, &resp->fh);
|
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
}
|
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->dirfh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ACCESS */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_accessres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_accessres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
if (resp->status == 0)
|
|
|
|
*p++ = htonl(resp->access);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* READLINK */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_readlinkres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = htonl(resp->len);
|
|
|
|
xdr_ressize_check(rqstp, p);
|
|
|
|
rqstp->rq_res.page_len = resp->len;
|
|
|
|
if (resp->len & 3) {
|
|
|
|
/* need to pad the tail */
|
|
|
|
rqstp->rq_res.tail[0].iov_base = p;
|
|
|
|
*p = 0;
|
|
|
|
rqstp->rq_res.tail[0].iov_len = 4 - (resp->len&3);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
} else
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* READ */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_readres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_readres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = htonl(resp->count);
|
|
|
|
*p++ = htonl(resp->eof);
|
|
|
|
*p++ = htonl(resp->count); /* xdr opaque count */
|
|
|
|
xdr_ressize_check(rqstp, p);
|
2011-03-31 03:57:33 +02:00
|
|
|
/* now update rqstp->rq_res to reflect data as well */
|
2005-04-17 00:20:36 +02:00
|
|
|
rqstp->rq_res.page_len = resp->count;
|
|
|
|
if (resp->count & 3) {
|
|
|
|
/* need to pad the tail */
|
|
|
|
rqstp->rq_res.tail[0].iov_base = p;
|
|
|
|
*p = 0;
|
|
|
|
rqstp->rq_res.tail[0].iov_len = 4 - (resp->count & 3);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
} else
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* WRITE */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_writeres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_writeres *resp = rqstp->rq_resp;
|
2012-12-06 12:23:19 +01:00
|
|
|
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_wcc_data(rqstp, p, &resp->fh);
|
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = htonl(resp->count);
|
|
|
|
*p++ = htonl(resp->committed);
|
2017-10-19 12:04:11 +02:00
|
|
|
/* unique identifier, y2038 overflow can be ignored */
|
|
|
|
*p++ = htonl((u32)nn->nfssvc_boot.tv_sec);
|
|
|
|
*p++ = htonl(nn->nfssvc_boot.tv_nsec);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CREATE, MKDIR, SYMLINK, MKNOD */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_createres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_diropres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = xdr_one;
|
|
|
|
p = encode_fh(p, &resp->fh);
|
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
}
|
|
|
|
p = encode_wcc_data(rqstp, p, &resp->dirfh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* RENAME */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_renameres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_renameres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_wcc_data(rqstp, p, &resp->ffh);
|
|
|
|
p = encode_wcc_data(rqstp, p, &resp->tfh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* LINK */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_linkres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_linkres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
p = encode_wcc_data(rqstp, p, &resp->tfh);
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* READDIR */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_readdirres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_readdirres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_post_op_attr(rqstp, p, &resp->fh);
|
|
|
|
|
|
|
|
if (resp->status == 0) {
|
|
|
|
/* stupid readdir cookie */
|
|
|
|
memcpy(p, resp->verf, 8); p += 2;
|
|
|
|
xdr_ressize_check(rqstp, p);
|
|
|
|
if (rqstp->rq_res.head[0].iov_len + (2<<2) > PAGE_SIZE)
|
|
|
|
return 1; /*No room for trailer */
|
|
|
|
rqstp->rq_res.page_len = (resp->count) << 2;
|
|
|
|
|
|
|
|
/* add the 'tail' to the end of the 'head' page - page 0. */
|
|
|
|
rqstp->rq_res.tail[0].iov_base = p;
|
|
|
|
*p++ = 0; /* no more entries */
|
|
|
|
*p++ = htonl(resp->common.err == nfserr_eof);
|
|
|
|
rqstp->rq_res.tail[0].iov_len = 2<<2;
|
|
|
|
return 1;
|
|
|
|
} else
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
2006-12-07 05:40:23 +01:00
|
|
|
static __be32 *
|
2006-10-20 08:28:57 +02:00
|
|
|
encode_entry_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name,
|
2007-08-16 18:10:07 +02:00
|
|
|
int namlen, u64 ino)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
*p++ = xdr_one; /* mark entry present */
|
|
|
|
p = xdr_encode_hyper(p, ino); /* file id */
|
|
|
|
p = xdr_encode_array(p, name, namlen);/* name length & name */
|
|
|
|
|
|
|
|
cd->offset = p; /* remember pointer */
|
|
|
|
p = xdr_encode_hyper(p, NFS_OFFSET_MAX);/* offset of next entry */
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2012-04-13 06:32:14 +02:00
|
|
|
static __be32
|
2005-04-17 00:20:36 +02:00
|
|
|
compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp,
|
2015-05-03 01:16:53 +02:00
|
|
|
const char *name, int namlen, u64 ino)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct svc_export *exp;
|
|
|
|
struct dentry *dparent, *dchild;
|
2012-04-13 06:32:14 +02:00
|
|
|
__be32 rv = nfserr_noent;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
dparent = cd->fh.fh_dentry;
|
|
|
|
exp = cd->fh.fh_export;
|
|
|
|
|
|
|
|
if (isdotent(name, namlen)) {
|
|
|
|
if (namlen == 2) {
|
|
|
|
dchild = dget_parent(dparent);
|
2012-04-13 06:32:14 +02:00
|
|
|
/* filesystem root - cannot return filehandle for ".." */
|
|
|
|
if (dchild == dparent)
|
|
|
|
goto out;
|
2005-04-17 00:20:36 +02:00
|
|
|
} else
|
|
|
|
dchild = dget(dparent);
|
|
|
|
} else
|
2016-01-07 22:08:20 +01:00
|
|
|
dchild = lookup_one_len_unlocked(name, dparent, namlen);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (IS_ERR(dchild))
|
2012-04-13 06:32:14 +02:00
|
|
|
return rv;
|
2009-09-04 20:13:09 +02:00
|
|
|
if (d_mountpoint(dchild))
|
|
|
|
goto out;
|
2015-03-17 23:25:59 +01:00
|
|
|
if (d_really_is_negative(dchild))
|
2009-09-04 20:13:09 +02:00
|
|
|
goto out;
|
2015-05-03 01:16:53 +02:00
|
|
|
if (dchild->d_inode->i_ino != ino)
|
|
|
|
goto out;
|
2012-04-13 06:32:14 +02:00
|
|
|
rv = fh_compose(fhp, exp, dchild, &cd->fh);
|
2009-09-04 20:13:09 +02:00
|
|
|
out:
|
2005-04-17 00:20:36 +02:00
|
|
|
dput(dchild);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2015-05-03 01:16:53 +02:00
|
|
|
static __be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen, u64 ino)
|
2009-09-04 20:13:09 +02:00
|
|
|
{
|
2014-01-09 22:24:35 +01:00
|
|
|
struct svc_fh *fh = &cd->scratch;
|
2012-04-13 06:32:14 +02:00
|
|
|
__be32 err;
|
2009-09-04 20:13:09 +02:00
|
|
|
|
2014-01-09 22:24:35 +01:00
|
|
|
fh_init(fh, NFS3_FHSIZE);
|
2015-05-03 01:16:53 +02:00
|
|
|
err = compose_entry_fh(cd, fh, name, namlen, ino);
|
2009-09-04 20:13:09 +02:00
|
|
|
if (err) {
|
|
|
|
*p++ = 0;
|
|
|
|
*p++ = 0;
|
2009-09-04 20:40:36 +02:00
|
|
|
goto out;
|
2009-09-04 20:13:09 +02:00
|
|
|
}
|
2014-01-09 22:24:35 +01:00
|
|
|
p = encode_post_op_attr(cd->rqstp, p, fh);
|
2009-09-04 20:13:09 +02:00
|
|
|
*p++ = xdr_one; /* yes, a file handle follows */
|
2014-01-09 22:24:35 +01:00
|
|
|
p = encode_fh(p, fh);
|
2009-09-04 20:40:36 +02:00
|
|
|
out:
|
2014-01-09 22:24:35 +01:00
|
|
|
fh_put(fh);
|
2009-09-04 20:13:09 +02:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* Encode a directory entry. This one works for both normal readdir
|
|
|
|
* and readdirplus.
|
|
|
|
* The normal readdir reply requires 2 (fileid) + 1 (stringlen)
|
|
|
|
* + string + 2 (cookie) + 1 (next) words, i.e. 6 + strlen.
|
|
|
|
*
|
|
|
|
* The readdirplus baggage is 1+21 words for post_op_attr, plus the
|
|
|
|
* file handle.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define NFS3_ENTRY_BAGGAGE (2 + 1 + 2 + 1)
|
|
|
|
#define NFS3_ENTRYPLUS_BAGGAGE (1 + 21 + 1 + (NFS3_FHSIZE >> 2))
|
|
|
|
static int
|
2007-03-27 07:32:08 +02:00
|
|
|
encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
|
2007-08-16 18:10:07 +02:00
|
|
|
loff_t offset, u64 ino, unsigned int d_type, int plus)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct nfsd3_readdirres *cd = container_of(ccd, struct nfsd3_readdirres,
|
|
|
|
common);
|
2006-10-20 08:28:57 +02:00
|
|
|
__be32 *p = cd->buffer;
|
2005-04-17 00:20:36 +02:00
|
|
|
caddr_t curr_page_addr = NULL;
|
2012-12-11 00:01:37 +01:00
|
|
|
struct page ** page;
|
2005-04-17 00:20:36 +02:00
|
|
|
int slen; /* string (name) length */
|
|
|
|
int elen; /* estimated entry length in words */
|
|
|
|
int num_entry_words = 0; /* actual number of words */
|
|
|
|
|
|
|
|
if (cd->offset) {
|
|
|
|
u64 offset64 = offset;
|
|
|
|
|
|
|
|
if (unlikely(cd->offset1)) {
|
|
|
|
/* we ended up with offset on a page boundary */
|
|
|
|
*cd->offset = htonl(offset64 >> 32);
|
|
|
|
*cd->offset1 = htonl(offset64 & 0xffffffff);
|
|
|
|
cd->offset1 = NULL;
|
|
|
|
} else {
|
2007-03-27 07:32:08 +02:00
|
|
|
xdr_encode_hyper(cd->offset, offset64);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
dprintk("encode_entry(%.*s @%ld%s)\n",
|
|
|
|
namlen, name, (long) offset, plus? " plus" : "");
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* truncate filename if too long */
|
2014-06-10 12:08:19 +02:00
|
|
|
namlen = min(namlen, NFS3_MAXNAMLEN);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
slen = XDR_QUADLEN(namlen);
|
|
|
|
elen = slen + NFS3_ENTRY_BAGGAGE
|
|
|
|
+ (plus? NFS3_ENTRYPLUS_BAGGAGE : 0);
|
|
|
|
|
|
|
|
if (cd->buflen < elen) {
|
|
|
|
cd->common.err = nfserr_toosmall;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* determine which page in rq_respages[] we are currently filling */
|
2012-12-11 00:01:37 +01:00
|
|
|
for (page = cd->rqstp->rq_respages + 1;
|
|
|
|
page < cd->rqstp->rq_next_page; page++) {
|
|
|
|
curr_page_addr = page_address(*page);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (((caddr_t)cd->buffer >= curr_page_addr) &&
|
|
|
|
((caddr_t)cd->buffer < curr_page_addr + PAGE_SIZE))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((caddr_t)(cd->buffer + elen) < (curr_page_addr + PAGE_SIZE)) {
|
|
|
|
/* encode entry in current page */
|
|
|
|
|
|
|
|
p = encode_entry_baggage(cd, p, name, namlen, ino);
|
|
|
|
|
2009-09-04 20:13:09 +02:00
|
|
|
if (plus)
|
2015-05-03 01:16:53 +02:00
|
|
|
p = encode_entryplus_baggage(cd, p, name, namlen, ino);
|
2005-04-17 00:20:36 +02:00
|
|
|
num_entry_words = p - cd->buffer;
|
2012-12-11 00:01:37 +01:00
|
|
|
} else if (*(page+1) != NULL) {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* temporarily encode entry into next page, then move back to
|
|
|
|
* current and next page in rq_respages[] */
|
2006-10-20 08:28:57 +02:00
|
|
|
__be32 *p1, *tmp;
|
2005-04-17 00:20:36 +02:00
|
|
|
int len1, len2;
|
|
|
|
|
|
|
|
/* grab next page for temporary storage of entry */
|
2012-12-11 00:01:37 +01:00
|
|
|
p1 = tmp = page_address(*(page+1));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
p1 = encode_entry_baggage(cd, p1, name, namlen, ino);
|
|
|
|
|
2009-09-04 20:13:09 +02:00
|
|
|
if (plus)
|
2015-05-03 01:16:53 +02:00
|
|
|
p1 = encode_entryplus_baggage(cd, p1, name, namlen, ino);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* determine entry word length and lengths to go in pages */
|
|
|
|
num_entry_words = p1 - tmp;
|
|
|
|
len1 = curr_page_addr + PAGE_SIZE - (caddr_t)cd->buffer;
|
|
|
|
if ((num_entry_words << 2) < len1) {
|
|
|
|
/* the actual number of words in the entry is less
|
|
|
|
* than elen and can still fit in the current page
|
|
|
|
*/
|
|
|
|
memmove(p, tmp, num_entry_words << 2);
|
|
|
|
p += num_entry_words;
|
|
|
|
|
|
|
|
/* update offset */
|
|
|
|
cd->offset = cd->buffer + (cd->offset - tmp);
|
|
|
|
} else {
|
|
|
|
unsigned int offset_r = (cd->offset - tmp) << 2;
|
|
|
|
|
|
|
|
/* update pointer to offset location.
|
|
|
|
* This is a 64bit quantity, so we need to
|
|
|
|
* deal with 3 cases:
|
|
|
|
* - entirely in first page
|
|
|
|
* - entirely in second page
|
|
|
|
* - 4 bytes in each page
|
|
|
|
*/
|
|
|
|
if (offset_r + 8 <= len1) {
|
|
|
|
cd->offset = p + (cd->offset - tmp);
|
|
|
|
} else if (offset_r >= len1) {
|
|
|
|
cd->offset -= len1 >> 2;
|
|
|
|
} else {
|
|
|
|
/* sitting on the fence */
|
|
|
|
BUG_ON(offset_r != len1 - 4);
|
|
|
|
cd->offset = p + (cd->offset - tmp);
|
|
|
|
cd->offset1 = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
len2 = (num_entry_words << 2) - len1;
|
|
|
|
|
|
|
|
/* move from temp page to current and next pages */
|
|
|
|
memmove(p, tmp, len1);
|
|
|
|
memmove(tmp, (caddr_t)tmp+len1, len2);
|
|
|
|
|
|
|
|
p = tmp + (len2 >> 2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
cd->common.err = nfserr_toosmall;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cd->buflen -= num_entry_words;
|
|
|
|
cd->buffer = p;
|
|
|
|
cd->common.err = nfs_ok;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2007-01-26 09:57:10 +01:00
|
|
|
nfs3svc_encode_entry(void *cd, const char *name,
|
|
|
|
int namlen, loff_t offset, u64 ino, unsigned int d_type)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
return encode_entry(cd, name, namlen, offset, ino, d_type, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2007-01-26 09:57:10 +01:00
|
|
|
nfs3svc_encode_entry_plus(void *cd, const char *name,
|
|
|
|
int namlen, loff_t offset, u64 ino,
|
|
|
|
unsigned int d_type)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
return encode_entry(cd, name, namlen, offset, ino, d_type, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FSSTAT */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_fsstatres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_fsstatres *resp = rqstp->rq_resp;
|
2005-04-17 00:20:36 +02:00
|
|
|
struct kstatfs *s = &resp->stats;
|
|
|
|
u64 bs = s->f_bsize;
|
|
|
|
|
|
|
|
*p++ = xdr_zero; /* no post_op_attr */
|
|
|
|
|
|
|
|
if (resp->status == 0) {
|
|
|
|
p = xdr_encode_hyper(p, bs * s->f_blocks); /* total bytes */
|
|
|
|
p = xdr_encode_hyper(p, bs * s->f_bfree); /* free bytes */
|
|
|
|
p = xdr_encode_hyper(p, bs * s->f_bavail); /* user available bytes */
|
|
|
|
p = xdr_encode_hyper(p, s->f_files); /* total inodes */
|
|
|
|
p = xdr_encode_hyper(p, s->f_ffree); /* free inodes */
|
|
|
|
p = xdr_encode_hyper(p, s->f_ffree); /* user available inodes */
|
|
|
|
*p++ = htonl(resp->invarsec); /* mean unchanged time */
|
|
|
|
}
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FSINFO */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_fsinfores *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = xdr_zero; /* no post_op_attr */
|
|
|
|
|
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = htonl(resp->f_rtmax);
|
|
|
|
*p++ = htonl(resp->f_rtpref);
|
|
|
|
*p++ = htonl(resp->f_rtmult);
|
|
|
|
*p++ = htonl(resp->f_wtmax);
|
|
|
|
*p++ = htonl(resp->f_wtpref);
|
|
|
|
*p++ = htonl(resp->f_wtmult);
|
|
|
|
*p++ = htonl(resp->f_dtpref);
|
|
|
|
p = xdr_encode_hyper(p, resp->f_maxfilesize);
|
|
|
|
*p++ = xdr_one;
|
|
|
|
*p++ = xdr_zero;
|
|
|
|
*p++ = htonl(resp->f_properties);
|
|
|
|
}
|
|
|
|
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PATHCONF */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_pathconfres *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = xdr_zero; /* no post_op_attr */
|
|
|
|
|
|
|
|
if (resp->status == 0) {
|
|
|
|
*p++ = htonl(resp->p_link_max);
|
|
|
|
*p++ = htonl(resp->p_name_max);
|
|
|
|
*p++ = htonl(resp->p_no_trunc);
|
|
|
|
*p++ = htonl(resp->p_chown_restricted);
|
|
|
|
*p++ = htonl(resp->p_case_insensitive);
|
|
|
|
*p++ = htonl(resp->p_case_preserving);
|
|
|
|
}
|
|
|
|
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* COMMIT */
|
|
|
|
int
|
2017-05-08 19:42:02 +02:00
|
|
|
nfs3svc_encode_commitres(struct svc_rqst *rqstp, __be32 *p)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 19:42:02 +02:00
|
|
|
struct nfsd3_commitres *resp = rqstp->rq_resp;
|
2012-12-06 12:23:19 +01:00
|
|
|
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
p = encode_wcc_data(rqstp, p, &resp->fh);
|
|
|
|
/* Write verifier */
|
|
|
|
if (resp->status == 0) {
|
2017-10-19 12:04:11 +02:00
|
|
|
/* unique identifier, y2038 overflow can be ignored */
|
|
|
|
*p++ = htonl((u32)nn->nfssvc_boot.tv_sec);
|
|
|
|
*p++ = htonl(nn->nfssvc_boot.tv_nsec);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
return xdr_ressize_check(rqstp, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XDR release functions
|
|
|
|
*/
|
2017-05-08 18:48:24 +02:00
|
|
|
void
|
|
|
|
nfs3svc_release_fhandle(struct svc_rqst *rqstp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 18:48:24 +02:00
|
|
|
struct nfsd3_attrstat *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
fh_put(&resp->fh);
|
|
|
|
}
|
|
|
|
|
2017-05-08 18:48:24 +02:00
|
|
|
void
|
|
|
|
nfs3svc_release_fhandle2(struct svc_rqst *rqstp)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2017-05-08 18:48:24 +02:00
|
|
|
struct nfsd3_fhandle_pair *resp = rqstp->rq_resp;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
fh_put(&resp->fh1);
|
|
|
|
fh_put(&resp->fh2);
|
|
|
|
}
|