1 files changed, 10 insertions, 0 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 13fb59aadebc..478003644916 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -2257,6 +2257,11 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
          * the flush returns error?
          */
         rc = filemap_write_and_wait(inode->i_mapping);
+        if (is_interrupt_error(rc)) {
+                rc = -ERESTARTSYS;
+                goto out;
+        }
+
         mapping_set_error(inode->i_mapping, rc);
         rc = 0;
 
@@ -2400,6 +2405,11 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
          * the flush returns error?
          */
         rc = filemap_write_and_wait(inode->i_mapping);
+        if (is_interrupt_error(rc)) {
+                rc = -ERESTARTSYS;
+                goto cifs_setattr_exit;
+        }
+
         mapping_set_error(inode->i_mapping, rc);
         rc = 0;