cifs: handle -EINTR in cifs_setattr
Subsystems (2)
PATCH 1/1 cifs: handle -EINTR in cifs_setattr
RHBZ: 1848178
Some calls that set attributes, like utimensat(), are not supposed to return -EINTR and thus do not have handlers for this in glibc which causes us to leak -EINTR to the applications which are also unprepared to handle it.
For example tar will break if utimensat() return -EINTR and abort unpacking the archive. Other applications may break too.
To handle this we add checks, and retry, for -EINTR in cifs_setattr()
--- fs/cifs/inode.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
fs/cifs/inode.c +9 -4
@@ -2879,13 +2879,18 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs) {struct cifs_sb_info *cifs_sb =CIFS_SB (direntry->d_sb);struct cifs_tcon *pTcon =cifs_sb_master_tcon (cifs_sb); +int rc, retries =0 ; -if (pTcon->unix_ext) -return cifs_setattr_unix (direntry, attrs); - -return cifs_setattr_nounix (direntry, attrs); +do { +if (pTcon->unix_ext) + rc =cifs_setattr_unix (direntry, attrs); +else + rc =cifs_setattr_nounix (direntry, attrs); + retries++; + }while (is_retryable_error (rc) && retries <2 );/* BB: add cifs_setattr_legacy for really old servers */ +return rc; }#if 0
Signature · 1 line
2.13.6
merged updated patch into cifs-2.6.git for-next
Quoted 47 lines · Ronnie Sahlberg
RHBZ: 1848178
Some calls that set attributes, like
utimensat(), are not supposed to return-EINTRand thus do not have handlers for this in glibc which causes us to leak-EINTRto the applications which are also unprepared to handle it.For example tar will break if
utimensat()return-EINTRand abort unpacking the archive. Other applications may break too.To handle this we add checks, and retry, for
-EINTRincifs_setattr()Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/inode.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)fs/cifs/inode.c +9
-5@@ -2879,13 +2879,18 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs) {struct cifs_sb_info *cifs_sb =CIFS_SB (direntry->d_sb);struct cifs_tcon *pTcon =cifs_sb_master_tcon (cifs_sb); +int rc, retries =0 ; -if (pTcon->unix_ext) -return cifs_setattr_unix (direntry, attrs); - -return cifs_setattr_nounix (direntry, attrs); +do { +if (pTcon->unix_ext) + rc =cifs_setattr_unix (direntry, attrs); +else + rc =cifs_setattr_nounix (direntry, attrs); + retries++; + }while (is_retryable_error (rc) && retries <2 );/* BB: add cifs_setattr_legacy for really old servers */ +return rc; }#if 0 --2.13.6
Signature · 3 lines
Thanks, Steve