nfsd: special case truncates some more
Subsystems (2)
PATCH v2 1/1 nfsd: special case truncates some more
Both the NFS protocols and the Linux VFS use a setattr operation with a bitmap of attributs to set to set various file attributes including the file size and the uid/gid.
The Linux syscalls never mixe size updates with unrelated updates like the uid/gid, and some file systems like XFS and GFS2 rely on the fact that truncates might not update random other attributes, and many other file systems handle the case but do not update the different attributes in the same transaction. NFSD on the other hand passes the attributes it gets on the wire more or less directly through to the VFS, leading to updates the file systems don't expect. XFS at least has an assert on the allowed attributes, which cought an NFS client sets the size and group at the same time.
To handles this issue properly this switches nfsd to call vfs_truncate for size changes, and then handling all other attributes through notify_change. As a side effect this also means less boilerplace code around the size change as we can now reuse the VFS code.
---
Changes since V1:
- avoid an extra setattr just for a MTIME attribute on the wire
fs/nfsd/vfs.c | 97 +++++++++++++++++++++++------------------------------------ 1 file changed, 37 insertions(+), 60 deletions(-)
fs/nfsd/vfs.c +37 -60
@@ -332,37 +332,6 @@ nfsd_sanitize_attrs(struct inode *inode, struct iattr *iap) } } -static __be32 -nfsd_get_write_access (struct svc_rqst *rqstp,struct svc_fh *fhp, -struct iattr *iap) -{ -struct inode *inode =d_inode (fhp->fh_dentry); -int host_err; - -if (iap->ia_size < inode->i_size) { -__be32 err; - - err =nfsd_permission (rqstp, fhp->fh_export, fhp->fh_dentry, -NFSD_MAY_TRUNC |NFSD_MAY_OWNER_OVERRIDE ); -if (err) -return err; - } - - host_err =get_write_access (inode); -if (host_err) - goto out_nfserrno; - - host_err =locks_verify_truncate (inode,NULL , iap->ia_size); -if (host_err) - goto out_put_write_access; -return 0 ; - -out_put_write_access: -put_write_access (inode); -out_nfserrno: -return nfserrno (host_err); -} -/* * Set various file attributes. After this call fhp needs an fh_put. */
@@ -377,7 +346,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,__be32 err;int host_err;bool get_write_count; -int size_change =0 ;if (iap->ia_valid & (ATTR_ATIME |ATTR_MTIME |ATTR_SIZE )) accmode |=NFSD_MAY_WRITE |NFSD_MAY_OWNER_OVERRIDE ;
@@ -390,11 +358,11 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,/* Get inode */ err =fh_verify (rqstp, fhp, ftype, accmode);if (err) - goto out; +return err;if (get_write_count) { host_err =fh_want_write (fhp);if (host_err) -return nfserrno (host_err); + goto out_host_err; } dentry = fhp->fh_dentry;
@@ -405,50 +373,59 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, iap->ia_valid &= ~ATTR_MODE ;if (!iap->ia_valid) - goto out; +return 0 ;nfsd_sanitize_attrs (inode, iap); +if (check_guard && guardtime != inode->i_ctime.tv_sec) +return nfserr_notsync; +/* * The size case is special, it changes the file in addition to the -* attributes. +* attributes, and file systems don't expect it to be mixed with +* "random" attribute changes. We thus split out the size change +* into a separate calo for vfs_truncate, and do the rest as a +* a separate setattr call. */ if (iap->ia_valid &ATTR_SIZE ) { - err =nfsd_get_write_access (rqstp, fhp, iap); -if (err) - goto out; - size_change =1 ; +struct path path = { + .mnt = fhp->fh_export->ex_path.mnt, + .dentry = dentry, + }; +bool implicit_mtime = false;/* -* RFC5661, Section 18.30.4: -* Changing the size of a file with SETATTR indirectly -* changes the time_modify and change attributes. -* -* (and similar for the older RFCs) +* vfs_truncate implicity updates the mtime IFF the file size +* actually changes. Avoid the additional seattr call below if +* the only other attribute that the client sends is the mtime. */ -if (iap->ia_size !=i_size_read (inode)) - iap->ia_valid |=ATTR_MTIME ; - } +if (iap->ia_size !=i_size_read (inode) && + ((iap->ia_valid & ~(ATTR_SIZE |ATTR_MTIME )) ==0 )) + implicit_mtime = true; - iap->ia_valid |=ATTR_CTIME ; + host_err =vfs_truncate (&path, iap->ia_size); +if (host_err) + goto out_host_err; -if (check_guard && guardtime != inode->i_ctime.tv_sec) { - err = nfserr_notsync; - goto out_put_write_access; + iap->ia_valid &= ~ATTR_SIZE ; +if (implicit_mtime) + iap->ia_valid &= ~ATTR_MTIME ; +if (!iap->ia_valid) + goto done; } + iap->ia_valid |=ATTR_CTIME ; +fh_lock (fhp); host_err =notify_change (dentry, iap,NULL );fh_unlock (fhp); - err =nfserrno (host_err); +if (host_err) + goto out_host_err; -out_put_write_access: -if (size_change) -put_write_access (inode); -if (!err) - err =nfserrno (commit_metadata (fhp)); -out: -return err; +done: + host_err =commit_metadata (fhp); +out_host_err: +return nfserrno (host_err); }#if defined(CONFIG_NFSD_V4 )
Signature · 1 line
2.1.4
Quoted 168 lines · Christoph Hellwig
Both the NFS protocols and the Linux VFS use a setattr operation with a bitmap of attributs to set to set various file attributes including the file size and the uid/gid.
The Linux syscalls never mixe size updates with unrelated updates like the uid/gid, and some file systems like XFS and GFS2 rely on the fact that truncates might not update random other attributes, and many other file systems handle the case but do not update the different attributes in the same transaction. NFSD on the other hand passes the attributes it gets on the wire more or less directly through to the VFS, leading to updates the file systems don't expect. XFS at least has an assert on the allowed attributes, which cought an NFS client sets the size and group at the same time.
To handles this issue properly this switches nfsd to call
vfs_truncatefor size changes, and then handling all other attributes throughnotify_change. As a side effect this also means less boilerplace code around the size change as we can now reuse the VFS code.Signed-off-by Christoph Hellwig <[email protected]>---
Changes since V1:
- avoid an extra setattr just for a MTIME attribute on the wirefs/nfsd/vfs.c | 97 +++++++++++++++++++++++------------------------------------ 1 file changed, 37 insertions(+), 60 deletions(-)fs/nfsd/vfs.c +33
-57@@ -332,37 +332,6 @@ nfsd_sanitize_attrs(struct inode *inode, struct iattr *iap) } } -static __be32 -nfsd_get_write_access (struct svc_rqst *rqstp,struct svc_fh *fhp, -struct iattr *iap) -{ -struct inode *inode =d_inode (fhp->fh_dentry); -int host_err; - -if (iap->ia_size < inode->i_size) { -__be32 err; - - err =nfsd_permission (rqstp, fhp->fh_export, fhp->fh_dentry, -NFSD_MAY_TRUNC |NFSD_MAY_OWNER_OVERRIDE ); -if (err) -return err; - } - - host_err =get_write_access (inode); -if (host_err) - goto out_nfserrno; - - host_err =locks_verify_truncate (inode,NULL , iap->ia_size); -if (host_err) - goto out_put_write_access; -return 0 ; - -out_put_write_access: -put_write_access (inode); -out_nfserrno: -return nfserrno (host_err); -} -/* * Set various file attributes. After this call fhp needs an fh_put. */ @@ -377,7 +346,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,__be32 err;int host_err;bool get_write_count; -int size_change =0 ;if (iap->ia_valid & (ATTR_ATIME |ATTR_MTIME |ATTR_SIZE )) accmode |=NFSD_MAY_WRITE |NFSD_MAY_OWNER_OVERRIDE ;@@ -390,11 +358,11 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,/* Get inode */ err =fh_verify (rqstp, fhp, ftype, accmode);if (err) - goto out; +return err;if (get_write_count) { host_err =fh_want_write (fhp);if (host_err) -return nfserrno (host_err); + goto out_host_err; } dentry = fhp->fh_dentry;@@ -405,50 +373,59 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, iap->ia_valid &= ~ATTR_MODE ;if (!iap->ia_valid) - goto out; +return 0 ;nfsd_sanitize_attrs (inode, iap); +if (check_guard && guardtime != inode->i_ctime.tv_sec) +return nfserr_notsync; +/* * The size case is special, it changes the file in addition to the -* attributes. +* attributes, and file systems don't expect it to be mixed with +* "random" attribute changes. We thus split out the size change +* into a separate calo for vfs_truncate, and do the rest as a +* a separate setattr call. */ if (iap->ia_valid &ATTR_SIZE ) { - err =nfsd_get_write_access (rqstp, fhp, iap); -if (err) - goto out; - size_change =1 ; +struct path path = { + .mnt = fhp->fh_export->ex_path.mnt, + .dentry = dentry, + }; +bool implicit_mtime = false;/* -* RFC5661, Section 18.30.4: -* Changing the size of a file with SETATTR indirectly -* changes the time_modify and change attributes. -* -* (and similar for the older RFCs) +* vfs_truncate implicity updates the mtime IFF the file size +* actually changes. Avoid the additional seattr call below if +* the only other attribute that the client sends is the mtime. */ -if (iap->ia_size !=i_size_read (inode)) - iap->ia_valid |=ATTR_MTIME ; - } +if (iap->ia_size !=i_size_read (inode) && + ((iap->ia_valid & ~(ATTR_SIZE |ATTR_MTIME )) ==0 )) + implicit_mtime = true; - iap->ia_valid |=ATTR_CTIME ; + host_err =vfs_truncate (&path, iap->ia_size); +if (host_err) + goto out_host_err; -if (check_guard && guardtime != inode->i_ctime.tv_sec) { - err = nfserr_notsync; - goto out_put_write_access; + iap->ia_valid &= ~ATTR_SIZE ; +if (implicit_mtime) + iap->ia_valid &= ~ATTR_MTIME ; +if (!iap->ia_valid) + goto done; } + iap->ia_valid |=ATTR_CTIME ; +fh_lock (fhp); host_err =notify_change (dentry, iap,NULL );fh_unlock (fhp); - err =nfserrno (host_err); +if (host_err) + goto out_host_err; -out_put_write_access: -if (size_change) -put_write_access (inode); -if (!err)
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, · line 431
Quoted 10 lines
fs/nfsd/vfs.c +4
-3- err =nfserrno (commit_metadata (fhp)); -out: -return err; +done: + host_err =commit_metadata (fhp); +out_host_err: +return nfserrno (host_err); }#if defined(CONFIG_NFSD_V4 )
Quoted 178 lines · Jeff Layton
Quoted 177 lines · Christoph Hellwig
Both the NFS protocols and the Linux VFS use a setattr operation with a bitmap of attributs to set to set various file attributes including the file size and the uid/gid.
The Linux syscalls never mixe size updates with unrelated updates like the uid/gid, and some file systems like XFS and GFS2 rely on the fact that truncates might not update random other attributes, and many other file systems handle the case but do not update the different attributes in the same transaction. NFSD on the other hand passes the attributes it gets on the wire more or less directly through to the VFS, leading to updates the file systems don't expect. XFS at least has an assert on the allowed attributes, which cought an NFS client sets the size and group at the same time.
To handles this issue properly this switches nfsd to call
vfs_truncatefor size changes, and then handling all other attributes throughnotify_change. As a side effect this also means less boilerplace code around the size change as we can now reuse the VFS code.Signed-off-by Christoph Hellwig <[email protected]>---
Changes since V1:
- avoid an extra setattr just for a MTIME attribute on the wirefs/nfsd/vfs.c | 97 +++++++++++++++++++++++------------------------------------ 1 file changed, 37 insertions(+), 60 deletions(-)fs/nfsd/vfs.c +37
-60@@ -332,37 +332,6 @@ nfsd_sanitize_attrs(struct inode *inode, struct iattr *iap) } } -static __be32 -nfsd_get_write_access (struct svc_rqst *rqstp,struct svc_fh *fhp, -struct iattr *iap) -{ -struct inode *inode =d_inode (fhp->fh_dentry); -int host_err; - -if (iap->ia_size < inode->i_size) { -__be32 err; - - err =nfsd_permission (rqstp, fhp->fh_export, fhp->fh_dentry, -NFSD_MAY_TRUNC |NFSD_MAY_OWNER_OVERRIDE ); -if (err) -return err; - } - - host_err =get_write_access (inode); -if (host_err) - goto out_nfserrno; - - host_err =locks_verify_truncate (inode,NULL , iap->ia_size); -if (host_err) - goto out_put_write_access; -return 0 ; - -out_put_write_access: -put_write_access (inode); -out_nfserrno: -return nfserrno (host_err); -} -/* * Set various file attributes. After this call fhp needs an fh_put. */ @@ -377,7 +346,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,__be32 err;int host_err;bool get_write_count; -int size_change =0 ;if (iap->ia_valid & (ATTR_ATIME |ATTR_MTIME |ATTR_SIZE )) accmode |=NFSD_MAY_WRITE |NFSD_MAY_OWNER_OVERRIDE ;@@ -390,11 +358,11 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,/* Get inode */ err =fh_verify (rqstp, fhp, ftype, accmode);if (err) - goto out; +return err;if (get_write_count) { host_err =fh_want_write (fhp);if (host_err) -return nfserrno (host_err); + goto out_host_err; } dentry = fhp->fh_dentry;@@ -405,50 +373,59 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, iap->ia_valid &= ~ATTR_MODE ;if (!iap->ia_valid) - goto out; +return 0 ;nfsd_sanitize_attrs (inode, iap); +if (check_guard && guardtime != inode->i_ctime.tv_sec) +return nfserr_notsync; +/* * The size case is special, it changes the file in addition to the -* attributes. +* attributes, and file systems don't expect it to be mixed with +* "random" attribute changes. We thus split out the size change +* into a separate calo for vfs_truncate, and do the rest as a +* a separate setattr call. */ if (iap->ia_valid &ATTR_SIZE ) { - err =nfsd_get_write_access (rqstp, fhp, iap); -if (err) - goto out; - size_change =1 ; +struct path path = { + .mnt = fhp->fh_export->ex_path.mnt, + .dentry = dentry, + }; +bool implicit_mtime = false;/* -* RFC5661, Section 18.30.4: -* Changing the size of a file with SETATTR indirectly -* changes the time_modify and change attributes. -* -* (and similar for the older RFCs) +* vfs_truncate implicity updates the mtime IFF the file size +* actually changes. Avoid the additional seattr call below if +* the only other attribute that the client sends is the mtime. */ -if (iap->ia_size !=i_size_read (inode)) - iap->ia_valid |=ATTR_MTIME ; - } +if (iap->ia_size !=i_size_read (inode) && + ((iap->ia_valid & ~(ATTR_SIZE |ATTR_MTIME )) ==0 )) + implicit_mtime = true; - iap->ia_valid |=ATTR_CTIME ; + host_err =vfs_truncate (&path, iap->ia_size); +if (host_err) + goto out_host_err; -if (check_guard && guardtime != inode->i_ctime.tv_sec) { - err = nfserr_notsync; - goto out_put_write_access; + iap->ia_valid &= ~ATTR_SIZE ; +if (implicit_mtime) + iap->ia_valid &= ~ATTR_MTIME ; +if (!iap->ia_valid) + goto done; } + iap->ia_valid |=ATTR_CTIME ; +fh_lock (fhp); host_err =notify_change (dentry, iap,NULL );fh_unlock (fhp); - err =nfserrno (host_err); +if (host_err) + goto out_host_err; -out_put_write_access: -if (size_change) -put_write_access (inode); -if (!err) - err =nfserrno (commit_metadata (fhp)); -out: -return err; +done: + host_err =commit_metadata (fhp); +out_host_err: +return nfserrno (host_err); }
Quoted 3 lines
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, · line 431
Quoted 1 line
fs/nfsd/vfs.c +0
-0#if defined(CONFIG_NFSD_V4 )Reviewed-by Jeff Layton <[email protected]>
OK, applying.--b.
NFS server regression in v4.10-rc7
In reply to Christoph HellwigQuoted 11 lines
Begin forwarded message:
=20
From: Christoph Hellwig <[email protected]>
Subject: [PATCH v2] nfsd: special case truncates some more
Date: January 24, 2017 at 3:22:41 AM EST
To: [email protected], [email protected]
Cc: [email protected], [email protected]
=20
Both the NFS protocols and the Linux VFS use a setattr operation with =
a
Quoted 1 line
bitmap of attributs to set to set various file attributes including =
the
Quoted 17 lines
file size and the uid/gid.
=20
The Linux syscalls never mixe size updates with unrelated updates like the uid/gid, and some file systems like XFS and GFS2 rely on the fact that truncates might not update random other attributes, and many other file systems handle the case but do not update the different attributes in the same transaction. NFSD on the other hand passes the attributes it gets on the wire more or less directly through to the VFS, leading to updates the file systems don't expect. XFS at least has an assert on the allowed attributes, which cought an NFS client sets the size and group at the same time.
=20
To handles this issue properly this switches nfsd to callvfs_truncatefor size changes, and then handling all other attributes throughnotify_change. As a side effect this also means less boilerplace code around the size change as we can now reuse the VFS code. =20
Quoted 7 lines
Signed-off-by Christoph Hellwig <[email protected]>---
=20
Changes since V1:
- avoid an extra setattr just for a MTIME attribute on the wire =20fs/nfsd/vfs.c| 97 =
+++++++++++++++++++++++------------------------------------
fs/nfsd/vfs.c nfsd_sanitize_attrs(struct inode *inode, struct =
Quoted 7 lines
1 file changed, 37 insertions(+), 60 deletions(-)=20
fs/nfsd/vfs.c +0
-0@@ -332,37 +332,6 @@ nfsd_sanitize_attrs(struct inode *inode, struct =
iattr *iap)
Quoted 4 lines
fs/nfsd/vfs.c +0
-0} }=20
fs/nfsd/vfs.c +0
-1-static __be32
fs/nfsd/vfs.c nfsd_sanitize_attrs(struct inode *inode, struct iattr *iap)
Quoted 10 lines
fs/nfsd/vfs.c +0
-10-nfsd_get_write_access(struct svc_rqst *rqstp, struct svc_fh *fhp, - struct iattr *iap) -{ - struct inode *inode =3D d_inode(fhp->fh_dentry); -int host_err; - - if (iap->ia_size < inode->i_size) { - __be32 err; - - err =3D nfsd_permission(rqstp, fhp->fh_export, =
fhp->fh_dentry,
fs/nfsd/vfs.c
Quoted 1 line
fs/nfsd/vfs.c +0
-1- NFSD_MAY_TRUNC | =
NFSD_MAY_OWNER_OVERRIDE);
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh =
Quoted 23 lines
fs/nfsd/vfs.c +0
-19-if (err) -return err; - } - - host_err =3D get_write_access(inode); -if (host_err) - goto out_nfserrno; - - host_err =3D locks_verify_truncate(inode, NULL, iap->ia_size); -if (host_err) - goto out_put_write_access; -return 0 ; - -out_put_write_access: -put_write_access (inode); -out_nfserrno: -return nfserrno (host_err); -} -/*
* Set various file attributes. After this call fhp needs anfh_put. */fs/nfsd/vfs.c +0
-0@@ -377,7 +346,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh =
*fhp, struct iattr *iap,
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct =
Quoted 8 lines
fs/nfsd/vfs.c +0
-1__be32 err;int host_err;bool get_write_count; - int size_change =3D 0;=20
if (iap->ia_valid & (ATTR_ATIME | ATTR_MTIME | ATTR_SIZE)) accmode |=3D NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE;fs/nfsd/vfs.c +0
-0@@ -390,11 +358,11 @@ nfsd_setattr(struct svc_rqst *rqstp, struct =
svc_fh *fhp, struct iattr *iap,
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct =
Quoted 14 lines
fs/nfsd/vfs.c +2
-2/* Get inode */ err =3D fh_verify(rqstp, fhp, ftype, accmode);if (err) - goto out; +return err;if (get_write_count) { host_err =3D fh_want_write(fhp);if (host_err) -return nfserrno (host_err); + goto out_host_err; }=20
dentry =3D fhp->fh_dentry;fs/nfsd/vfs.c +0
-0@@ -405,50 +373,59 @@ nfsd_setattr(struct svc_rqst *rqstp, struct =
svc_fh *fhp, struct iattr *iap,
Quoted 11 lines
fs/nfsd/vfs.c +0
-0iap->ia_valid &=3D ~ATTR_MODE;=20
if (!iap->ia_valid)fs/nfsd/vfs.c +1
-1- goto out; +return 0 ;=20
nfsd_sanitize_attrs(inode, iap);=20
fs/nfsd/vfs.c +3
-0+ if (check_guard && guardtime !=3D inode->i_ctime.tv_sec) +return nfserr_notsync; +
Quoted 2 lines
/* * The size case is special, it changes the file in addition to =
the
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
Quoted 3 lines
fs/nfsd/vfs.c +2
-1-* attributes. +* attributes, and file systems don't expect it to be mixed with +* "random" attribute changes. We thus split out the size =
change
Quoted 15 lines
fs/nfsd/vfs.c +2
-0+* into a separate calo for vfs_truncate, and do the rest as a +* a separate setattr call. */ if (iap->ia_valid & ATTR_SIZE) {fs/nfsd/vfs.c +5
-4- err =3D nfsd_get_write_access(rqstp, fhp, iap); -if (err) - goto out; - size_change =3D 1; + struct path path =3D { + .mnt =3D fhp->fh_export->ex_path.mnt, + .dentry =3D dentry, + }; + bool implicit_mtime =3D false;=20
/*
fs/nfsd/vfs.c nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
Quoted 6 lines
fs/nfsd/vfs.c +1
-5-* RFC5661, Section 18.30.4: -* Changing the size of a file with SETATTR indirectly -* changes the time_modify and change attributes. -* -* (and similar for the older RFCs) +* vfs_truncate implicity updates the mtime IFF the file =
size
fs/nfsd/vfs.c
Quoted 1 line
fs/nfsd/vfs.c +1
-0+* actually changes. Avoid the additional seattr call =
below if
fs/nfsd/vfs.c
Quoted 1 line
fs/nfsd/vfs.c +1
-0+* the only other attribute that the client sends is the =
mtime.
fs/nfsd/vfs.c
Quoted 6 lines
*/fs/nfsd/vfs.c +2
-3- if (iap->ia_size !=3D i_size_read(inode)) - iap->ia_valid |=3D ATTR_MTIME; - } + if (iap->ia_size !=3D i_size_read(inode) && + ((iap->ia_valid & ~(ATTR_SIZE | ATTR_MTIME)) =3D=3D =
0))
Quoted 37 lines
fs/nfsd/vfs.c +1
-0+ implicit_mtime =3D true;=20
fs/nfsd/vfs.c +3
-1- iap->ia_valid |=3D ATTR_CTIME; + host_err =3D vfs_truncate(&path, iap->ia_size); +if (host_err) + goto out_host_err;=20
fs/nfsd/vfs.c +5
-3- if (check_guard && guardtime !=3D inode->i_ctime.tv_sec) { - err =3D nfserr_notsync; - goto out_put_write_access; + iap->ia_valid &=3D ~ATTR_SIZE; +if (implicit_mtime) + iap->ia_valid &=3D ~ATTR_MTIME; +if (!iap->ia_valid) + goto done;}=20
fs/nfsd/vfs.c +2
-0+ iap->ia_valid |=3D ATTR_CTIME; +fh_lock(fhp); host_err =3D notify_change(dentry, iap, NULL); fh_unlock(fhp);fs/nfsd/vfs.c +2
-1- err =3D nfserrno(host_err); +if (host_err) + goto out_host_err;=20
fs/nfsd/vfs.c +4
-7-out_put_write_access: -if (size_change) -put_write_access (inode); -if (!err) - err =3D nfserrno(commit_metadata(fhp)); -out: -return err; +done: + host_err =3D commit_metadata(fhp); +out_host_err: +return nfserrno (host_err);
Quoted 5 lines
}
=20
#ifdefined(CONFIG_NFSD_V4)
--=20
2.1.4
After installing v4.10-rc7 on my test NFS server, I'm seeing a failure with the git regression test suite.
*** t1050-large.sh ***
ok 1 - setup
ok 2 - add a large file or two
ok 3 - checkout a large file
not ok 4 - packsize limit
# =20
# test_create_repo mid &&
# (
# cd mid && # git config core.bigfilethreshold 64k && # git config pack.packsizelimit 256k && # =20 # # mid1 and mid2 will fit within 256k limit but # # appending mid3 will bust the limit and will # # result in a separate packfile. # test-genrandom "a" $(( 66 * 1024 )) >mid1 && # test-genrandom "b" $(( 80 * 1024 )) >mid2 && # test-genrandom "c" $(( 128 * 1024 )) >mid3 && # git add mid1 mid2 mid3 && # =20 # count=3D0 # for pi in .git/objects/pack/pack-*.idx # do
# test -f "$pi" && count=3D$(( $count + 1 ))
# done &&
# test $count =3D 2 &&
# =20
# (
# git hash-object --stdin <mid1 # git hash-object --stdin <mid2 # git hash-object --stdin <mid3
# ) |
# sort >expect &&
# =20
# for pi in .git/objects/pack/pack-*.idx
# do
# git show-index <"$pi"
# done | # sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" | # sort >actual &&
# =20
# test_cmp expect actual
# )
# =20
ok 5 - diff --raw
ok 6 - diff --stat
ok 7 - diff
Confirmed with NFSv3 / TCP and NFSv4.0 / TCP. Failure is 100% reproducible.
If I revert the above commit on the server, the git regression test suite passes.
The test is run like this: "cd /mnt/server/git; make clean; make; make = test"
Can anyone else reproduce this failure?
--
Chuck Lever
[email protected]
Re: NFS server regression in v4.10-rc7
Quoted 3 lines · Chuck Lever
The test is run like this: "cd
/mnt/server/git; make clean; make; make test"Can anyone else reproduce this failure?
What local file system do you use on the server?
Re: NFS server regression in v4.10-rc7
Quoted 2 lines
On Feb 8, 2017, at 4:39 PM, Christoph Hellwig <[email protected]> =
Quoted 3 lines · wrote:
=20
Quoted 1 line · Chuck Lever
The test is run like this: "cd
/mnt/server/git; make clean; make; =
make test"
Quoted 4 lines
Quoted 2 lines
=20
Can anyone else reproduce this failure?=20
What local file system do you use on the server?
I see this with my tmpfs export.
--
Chuck Lever
[email protected]
Re: NFS server regression in v4.10-rc7
Quoted 1 line · Chuck Lever
I see this with my tmpfs export.
The tests passes fine for me with latests mainline on either tmpfs or xfs. This is on a 64-bit x86 VM.
Re: NFS server regression in v4.10-rc7
Quoted 5 lines · Christoph Hellwig
Quoted 1 line · Chuck Lever
I see this with my tmpfs export.
The tests passes fine for me with latests mainline on either tmpfs or xfs. This is on a 64-bit x86 VM.
But that was running as root, I've now reproduced it running as a regular user.