CIFS: Improve indentation in cifs_user_read()
authorPavel Shilovsky <pshilovsky@samba.org>
Thu, 10 Jul 2014 07:50:39 +0000 (11:50 +0400)
committerSteve French <smfrench@gmail.com>
Sat, 2 Aug 2014 06:23:04 +0000 (01:23 -0500)
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/file.c

index c3390e2c6e0d33a8aa75fe3893270ed6ea31c01f..e17012817d9dd6dc131cdbddae76850aabbe6e68 100644 (file)
@@ -3027,28 +3027,27 @@ again:
                        rc = wait_for_completion_killable(&rdata->done);
                        if (rc)
                                rc = -EINTR;
-                       else if (rdata->result) {
-                               rc = rdata->result;
+                       else if (rdata->result == -EAGAIN) {
                                /* resend call if it's a retryable error */
-                               if (rc == -EAGAIN) {
-                                       struct list_head tmp_list;
+                               struct list_head tmp_list;
 
-                                       list_del_init(&rdata->list);
-                                       INIT_LIST_HEAD(&tmp_list);
+                               list_del_init(&rdata->list);
+                               INIT_LIST_HEAD(&tmp_list);
 
-                                       rc = cifs_send_async_read(rdata->offset,
+                               rc = cifs_send_async_read(rdata->offset,
                                                rdata->bytes, rdata->cfile,
                                                cifs_sb, &tmp_list);
 
-                                       list_splice(&tmp_list, &rdata_list);
+                               list_splice(&tmp_list, &rdata_list);
 
-                                       kref_put(&rdata->refcount,
-                                               cifs_uncached_readdata_release);
-                                       goto again;
-                               }
-                       } else {
+                               kref_put(&rdata->refcount,
+                                        cifs_uncached_readdata_release);
+                               goto again;
+                       } else if (rdata->result)
+                               rc = rdata->result;
+                       else
                                rc = cifs_readdata_to_iov(rdata, to);
-                       }
+
                        /* if there was a short read -- discard anything left */
                        if (rdata->got_bytes && rdata->got_bytes < rdata->bytes)
                                rc = -ENODATA;