aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorPavel Shilovsky <pshilovsky@samba.org>2014-07-10 03:50:39 -0400
committerSteve French <smfrench@gmail.com>2014-08-02 02:23:04 -0400
commitfb8a3e52559ad52829c6838d304f5b75c140b97a (patch)
treec483c138c1a0f299a35c9b02e8b6c8b4f5c92dd1 /fs/cifs
parent2e8a05d80213cdfbf3bf8e6eb3059831c7015e89 (diff)
CIFS: Improve indentation in cifs_user_read()
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/file.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index c3390e2c6e0d..e17012817d9d 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3027,28 +3027,27 @@ again:
3027 rc = wait_for_completion_killable(&rdata->done); 3027 rc = wait_for_completion_killable(&rdata->done);
3028 if (rc) 3028 if (rc)
3029 rc = -EINTR; 3029 rc = -EINTR;
3030 else if (rdata->result) { 3030 else if (rdata->result == -EAGAIN) {
3031 rc = rdata->result;
3032 /* resend call if it's a retryable error */ 3031 /* resend call if it's a retryable error */
3033 if (rc == -EAGAIN) { 3032 struct list_head tmp_list;
3034 struct list_head tmp_list;
3035 3033
3036 list_del_init(&rdata->list); 3034 list_del_init(&rdata->list);
3037 INIT_LIST_HEAD(&tmp_list); 3035 INIT_LIST_HEAD(&tmp_list);
3038 3036
3039 rc = cifs_send_async_read(rdata->offset, 3037 rc = cifs_send_async_read(rdata->offset,
3040 rdata->bytes, rdata->cfile, 3038 rdata->bytes, rdata->cfile,
3041 cifs_sb, &tmp_list); 3039 cifs_sb, &tmp_list);
3042 3040
3043 list_splice(&tmp_list, &rdata_list); 3041 list_splice(&tmp_list, &rdata_list);
3044 3042
3045 kref_put(&rdata->refcount, 3043 kref_put(&rdata->refcount,
3046 cifs_uncached_readdata_release); 3044 cifs_uncached_readdata_release);
3047 goto again; 3045 goto again;
3048 } 3046 } else if (rdata->result)
3049 } else { 3047 rc = rdata->result;
3048 else
3050 rc = cifs_readdata_to_iov(rdata, to); 3049 rc = cifs_readdata_to_iov(rdata, to);
3051 } 3050
3052 /* if there was a short read -- discard anything left */ 3051 /* if there was a short read -- discard anything left */
3053 if (rdata->got_bytes && rdata->got_bytes < rdata->bytes) 3052 if (rdata->got_bytes && rdata->got_bytes < rdata->bytes)
3054 rc = -ENODATA; 3053 rc = -ENODATA;