]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
orangefs: do not return successful read when the client-core disappeared
authorMartin Brandenburg <martin@omnibond.com>
Tue, 6 Nov 2018 19:51:39 +0000 (19:51 +0000)
committerMike Marshall <hubcap@omnibond.com>
Fri, 3 May 2019 18:32:38 +0000 (14:32 -0400)
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
fs/orangefs/file.c

index d8c97b87bf265f99acd4ccdfb65214702b68cbe0..0af9f0b42d80602925b67df141959efdc906e313 100644 (file)
@@ -169,7 +169,10 @@ ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inode,
                         * trigger the write.
                         */
                        case OP_VFS_STATE_INPROGR:
-                               ret = total_size;
+                               if (type == ORANGEFS_IO_READ)
+                                       ret = -EINTR;
+                               else
+                                       ret = total_size;
                                break;
                        default:
                                gossip_err("%s: unexpected op state :%d:.\n",