mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	devel@driverdev.osuosl.org,
	Andreas Dilger <andreas.dilger@intel.com>,
	Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lustre Development List <lustre-devel@lists.lustre.org>,
	Dmitry Eremin <dmitry.eremin@intel.com>,
	James Simmons <jsimmons@infradead.org>
Subject: [PATCH 12/12] staging: lustre: llite: fixup return value ll_direct_IO_26
Date: Wed, 27 Apr 2016 21:37:21 -0400	[thread overview]
Message-ID: <1461807441-3210-13-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1461807441-3210-1-git-send-email-jsimmons@infradead.org>

From: Dmitry Eremin <dmitry.eremin@intel.com>

Return the correct values from ll_direct_IO_26.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4069
Reviewed-on: http://review.whamcloud.com/8080
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-Off-by: James Simmons <jsimmons@infradead.org>
---
 drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index a740c7a..9341189 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -446,7 +446,7 @@ out:
 	}
 
 	cl_env_put(env, &refcheck);
-	return tot_bytes ? : result;
+	return tot_bytes ? tot_bytes : result;
 }
 
 /**
-- 
2.7.4

      parent reply	other threads:[~2016-04-28  1:37 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-28  1:37 [PATCH 00/12] staging: lustre: add patches from lustre 2.5.52 version James Simmons
2016-04-28  1:37 ` [PATCH 01/12] staging: lustre: obd: remove newline from LCONSOLE string James Simmons
2016-04-28  1:37 ` [PATCH 02/12] staging: lustre: obd: add newline for dumped config record James Simmons
2016-04-28  1:37 ` [PATCH 03/12] staging: lustre: ptlrpc: use unified handler for OST requests James Simmons
2016-04-28  1:37 ` [PATCH 04/12] staging: lustre: ldlm: check all errors during ldlm_debugfs_setup() James Simmons
2016-04-28  1:37 ` [PATCH 05/12] staging: lustre: obd: cleanup client import if client_obd_setup fails James Simmons
2016-04-28  1:37 ` [PATCH 06/12] staging: lustre: fid: add a connect flag for open by FID James Simmons
2016-04-28  1:37 ` [PATCH 07/12] staging: lustre: libcfs: Fix NUMA emulated mode James Simmons
2016-04-28  1:37 ` [PATCH 08/12] staging: lustre: llite: debugging for ll_file_open LASSERT James Simmons
2016-04-28  1:37 ` [PATCH 09/12] staging: lustre: llite: check ret of ll_prep_md_op_data in ll_dir_filler James Simmons
2016-04-28  1:37 ` [PATCH 10/12] staging: lustre: llog: we don't need vfsmount James Simmons
2016-04-28  1:37 ` [PATCH 11/12] staging: lustre: ptlrpc: initialize request session early James Simmons
2016-04-28  1:37 ` James Simmons [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461807441-3210-13-git-send-email-jsimmons@infradead.org \
    --to=jsimmons@infradead.org \
    --cc=andreas.dilger@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dmitry.eremin@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lustre-devel@lists.lustre.org \
    --cc=oleg.drokin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®