1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e016e0906e1a..488ec7948a57 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -2816,15 +2816,18 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon
 
                 if (cmd_in == MTWEOF &&
                     cmdstatp->have_sense &&
-                    (cmdstatp->flags & SENSE_EOM) &&
-                    (cmdstatp->sense_hdr.sense_key == NO_SENSE ||
-                     cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) &&
-                    undone == 0) {
-                        ioctl_result = 0;       /* EOF written successfully at EOM */
-                        if (fileno >= 0)
-                                fileno++;
+                    (cmdstatp->flags & SENSE_EOM)) {
+                        if (cmdstatp->sense_hdr.sense_key == NO_SENSE ||
+                            cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) {
+                                ioctl_result = 0;       /* EOF(s) written successfully at EOM */
+                                STps->eof = ST_NOEOF;
+                        } else {  /* Writing EOF(s) failed */
+                                if (fileno >= 0)
+                                        fileno -= undone;
+                                if (undone < arg)
+                                        STps->eof = ST_NOEOF;
+                        }
                         STps->drv_file = fileno;
-                        STps->eof = ST_NOEOF;
                 } else if ((cmd_in == MTFSF) || (cmd_in == MTFSFM)) {
                         if (fileno >= 0)
                                 STps->drv_file = fileno - undone;