averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity
589,584 Commits 116 Branches 5,777 Tags
1366a3db3dcf4d64c5eb0621df79a3d1cf2da5da
Commit Graph
589584 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Kershner 1366a3db3d staging: unisys: visorbus: visorchipset_init clean up gotos 
Several error paths were not logging a message to s-Par during failure.
Error paths in visorchipset_init() were corrected so that they now all
do proper clean-ups. This made it necessary to move the function
visorchipset_file_cleanup() above visorchipset_init so it can be
referenced.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:13:51 -07:00
David Binder 2b9bcf81d3 staging: unisys: visorchannel: remove redundant member size 
Removes size member from the visorchannel struct, since it was
a duplicate of the nbytes member.

Signed-off-by: David Binder <david.binder@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:13:51 -07:00
Tim Sell dc38082f0f staging: unisys: visornic: CHECK: Alignment should match open parenthesis 
Fix 'CHECK: Alignment should match open parenthesis' as recommended by
checkpatch.

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:11:09 -07:00
Tim Sell a07d7c3858 staging: unisys: visorbus: CHECK: Alignment should match open parenthesis 
Fix 'CHECK: Alignment should match open parenthesis' as recommended by
checkpatch.

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:11:09 -07:00
Tim Sell e4feb2f257 staging: unisys: visorbus: 'unsigned' --> 'unsigned int' 
Fix as recommended by checkpatch.

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:11:09 -07:00
Cihangir Akturk 3726470610 staging: lustre: split error handling code into multiple labels 
Instead of using a switch-case statement to find out what kind of error
has just happened, split error handling logic into multiple labels and
jump right into the appropriate label to do the error handling. This way
it is easier to follow different code paths. It also looks easy on the
eyes.

Additionally silences the following coccinelle warning:

drivers/staging/lustre/lustre/obdecho/echo_client.c:762:22-27: ERROR: ed
is NULL but dereferenced.

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:03:27 -07:00
James Simmons c970b6058b staging: lustre: selftest: change srpc_state_t to proper enum 
Turn typedef srpc_state_t to proper enum

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:58 -07:00
James Simmons fd7a1a3251 staging: lustre: selftest: convert srpc_msg_t to proper struct 
Turn typedef struct srpc_msg to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:55 -07:00
James Simmons dcdc7c84fb staging: lustre: selftest: convert lstcon_batch_t to proper struct 
Turn typedef lstcon_batch_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons 7299d18604 staging: lustre: selftest: convert lstcon_tsb_hdr_t to proper struct 
Turn typedef lstcon_tsb_hdr_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons 6bd88c7ad4 staging: lustre: selftest: convert lstcon_group_t to proper struct 
Turn typedef lstcon_group_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons e00f978ef5 staging: lustre: selftest: convert lstcon_ndlink_t to proper struct 
Turn typedef lstcon_ndlink_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons f1e34162fe staging: lustre: selftest: convert lstcon_node_t to proper struct 
Turn typedef lstcon_node_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons d8742c855b staging: lustre: selftest: convert lstcon_rpc_trans_t to proper struct 
Turn typedef lstcon_rpc_trans_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons dc4f95fa59 staging: lustre: selftest: convert lstcon_rpc_t to proper struct 
Turn typedef lstcon_rpc_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons d6615d1430 staging: lustre: selftest: convert sfw_test_case_t to proper struct 
Turn typedef sfw_test_case_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons d875b0ce5f staging: lustre: selftest: convert sfw_test_unit_t to proper struct 
Turn typedef sfw_test_unit_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons 7ca48d8585 staging: lustre: selftest: convert sfw_test_instance_t to proper struct 
Turn typedef sfw_test_instance_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:01:20 -07:00
James Simmons d9c460ea76 staging: lustre: selftest: convert sfw_test_client_ops_t to proper struct 
Turn typedef sfw_test_client_ops_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 074bca9664 staging: lustre: selftest: convert sfw_batch_t to proper struct 
Turn typedef sfw_batch_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 693d26648a staging: lustre: selftest: convert sfw_session_t to proper struct 
Turn typedef sfw_session_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 682513b863 staging: lustre: selftest: convert srpc_service_t to proper struct 
Turn typedef srpc_service_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 20234da542 staging: lustre: selftest: convert srpc_client_rpc_t to proper struct 
Turn typedef srpc_client_rpc_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 25a9ca5202 staging: lustre: selftest: convert swi_workitem_t to proper struct 
Turn typedef swi_workitem_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons 4b064e9528 staging: lustre: selftest: convert srpc_buffer_t to proper struct 
Turn typedef srpc_buffer_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:56 -07:00
James Simmons eb6e1342ee staging: lustre: selftest: convert srpc_bulk_t to proper struct 
Turn typedef srpc_bulk_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 21:00:11 -07:00
James Simmons 8607338f3d staging: lustre: selftest: convert srpc_event_t to proper struct 
Turn typedef srpc_event_t to proper structure

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:58:20 -07:00
James Simmons c22594f6b1 staging: lustre: selftest: convert srpc_event_type to proper enum 
Turn tyepdef srpc_event_type to proper enum

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:55:12 -07:00
Sudip Mukherjee 0888f388e6 staging/lustre/obdclass: fix build warning 
While building with W=1 we were getting the warning:

drivers/staging/lustre/lustre/obdclass/cl_object.c:1056:16:
	warning: old-style function definition
 struct lu_env *cl_env_percpu_get()
                ^

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:55:12 -07:00
Sebastien Buisson 19c551482a staging: lustre: fix 'no effect' errors 
Fix 'no effect' issues found by Coverity version 6.5.1:

Unsigned compared against 0 (NO_EFFECT)
This greater-than-or-equal-to-zero comparison of an unsigned value
is always true.

Remove useless cast.

Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3907
Reviewed-on: http://review.whamcloud.com/7166
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Jinshan Xiong e179800665 staging: lustre: hsm: Add support to drop all pages for ll_data_version 
This will be used by HSM release to get data version and drop all
caching pages from all clients, before sending IT_RELEASE close
REQ to MDT.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/6794
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Aurelien Degremont <aurelien.degremont@cea.fr>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Jinshan Xiong e55a68b6ea staging: lustre: llite: cancel open lock before closing file 
In error handling path of ll_lease_open(), och has already been
freed in ll_close_inode_openhandle() so the sequence of cancel
open lock and close open handle need adjusting.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7346
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Sebastien Buisson 0fcd869f9e staging: lustre: fix 'NULL pointer dereference' errors 
Fix 'NULL pointer dereference' defects found by Coverity version
6.5.0:
Dereference after null check (FORWARD_NULL)
For instance, Passing null pointer to a function which dereferences
it.
Dereference before null check (REVERSE_INULL)
Null-checking variable suggests that it may be null, but it has
already been dereferenced on all paths leading to the check.
Dereference null return value (NULL_RETURNS)

Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3042
Reviewed-on: http://review.whamcloud.com/5868
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
JC Lafoucriere a7a9ed4b5d staging: lustre: hsm: Add CLF_RENAME_LAST flag 
Create a special flag for the last rename event.

Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3718
Reviewed-on: http://review.whamcloud.com/7260
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Ned Bass 6a1938d958 staging: lustre: mdc: document mdc_rpc_lock 
As this lock can be a bottleneck, clarifying why it is needed may be
helpful to those working on client performance.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3443
Reviewed-on: http://review.whamcloud.com/6593
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Gaurav Mahajan 46dfb5aa98 staging: lustre: llite: Delaying creation of client side proc entries. 
In client_common_fill_super() proc entries are created before
before cl_sb_init() and therefore lu_site is not allocated resulting
in client crash when tried reading lu_site stats.
Delaying creation of proc entries after creation of all required data
structures fixed the problem.

Signed-off-by: Gaurav Mahajan <gmahajan@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2941
Reviewed-on: http://review.whamcloud.com/6852
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:10 -07:00
Swapnil Pimpale 98b29828b7 staging: lustre: lov: Get the correct address of lmm_objects 
The introduction of lmm_layout_gen makes the assumption that
lmm_objects is present after lmm_stripe_count incorrect.
Fixed this to get the correct address of lmm_objects when lmmk is cast
to lov_mds_md_v1.

Signed-off-by: Swapnil Pimpale <spimpale@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3162
Reviewed-on: http://review.whamcloud.com/7258
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Aurelien Degremont c5300d55e2 staging: lustre: hsm: copy start error should set HP_FLAG_COMPLETED 
If an error occurs when initializing a HSM request, in
ll_ioc_copy_start(), the PROGRESS message, sent to coordinator, should
carry the error code but also HP_FLAG_COMPLETED to mark the request as
finished (with error). If not, the Coordinator will ignore this
message and consider the request is still running.

Signed-off-by: Aurelien Degremont <aurelien.degremont@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3685
Reviewed-on: http://review.whamcloud.com/7265
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
JC Lafoucriere 18ecab0d95 staging: lustre: hsm: rename hai_zero() HSM function 
rename hai_zero() to hai_first(). Use a better name for hai helper

Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3709
Reviewed-on: http://review.whamcloud.com/7254
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Jinshan Xiong ead0280835 staging: lustre: hsm: Fix lu_ref for lease handle 
The lu_ref was not being decremented when releasing the
lease handle.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7243
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Jinshan Xiong 83c61a5c54 staging: lustre: libcfs: make D_HSM a unique value 
Redefine D_HSM. It was defined to D_TRACE.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7243
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Jinshan Xiong 6f11cd978e staging: lustre: libcfs: create array of debug names 
Instead of a using a growing case statement to handle
more debugging options create a array to map debug
flags to string names.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7243
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Jinshan Xiong 66fbe4ef96 staging: lustre: libcfs: remove userland comments in libcfs_debug.h 
Remove comments about userland use.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7243
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: jacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Niu Yawei d467220e61 staging: lustre: llite: use 64bits flags in ll_lov_setea() 
In ll_lov_setea(), setting MDS_OPEN_HAS_OBJS to an int flags will
result in the flags being overflowed.

Signed-off-by: Niu Yawei <yawei.niu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3744
Reviewed-on: http://review.whamcloud.com/7312
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Sebastien Buisson 0715f9417a staging: lustre: ldlm: fix 'deadcode' errors 
Fix 'deadcode' issues found by Coverity version 6.5.1:
Logically dead code (DEADCODE)
Execution cannot reach this statement.

Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3097
Reviewed-on: http://review.whamcloud.com/7167
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:47:04 -07:00
Oleg Drokin 7f2d15bb58 staging/lustre: Get rid of ldlm_policy_res_t typedef 
Directly use enum ldlm_policy_res everywhere.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:44:17 -07:00
Oleg Drokin da5ecb4dfd staging/lustre: Fix braces {} style 
This fixes all checkpatch form of this from the Lustre tree:
CHECK: braces {} should be used on all arms of this statement

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 20:44:03 -07:00
Greg Kroah-Hartman 5f47992491 Merge 4.6-rc3 into staging-next 
This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2016-04-11 09:30:50 -07:00
Linus Torvalds bf16200689 Linux 4.6-rc3 v4.6-rc3 2016-04-10 17:58:30 -07:00
Linus Torvalds 08b15d1386 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 
Pull ARM fixes from Russell King:
 "A couple of small fixes, and wiring up the new syscalls which appeared
  during the merge window"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8550/1: protect idiv patching against undefined gcc behavior
  ARM: wire up preadv2 and pwritev2 syscalls
  ARM: SMP enable of cache maintanence broadcast
 2016-04-10 17:48:17 -07:00