diff --git a/[refs] b/[refs] index d7a5c81dc440..614534ebb0d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a67570c76402b36695cd0725e28649ee8fe830d +refs/heads/master: bb5a9a04d4cab4b13d63ac5cd3e1fb35f9583607 diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c index dd26e2759b17..5f7c374ae89c 100644 --- a/trunk/fs/cifs/file.c +++ b/trunk/fs/cifs/file.c @@ -1179,12 +1179,10 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to) atomic_dec(&open_file->wrtPending); /* Does mm or vfs already set times? */ inode->i_atime = inode->i_mtime = current_fs_time(inode->i_sb); - if ((bytes_written > 0) && (offset)) { + if ((bytes_written > 0) && (offset)) rc = 0; - } else if (bytes_written < 0) { - if (rc != -EBADF) - rc = bytes_written; - } + else if (bytes_written < 0) + rc = bytes_written; } else { cFYI(1, ("No writeable filehandles for inode")); rc = -EIO;