Commit 364139d3 authored by Ben Evans's avatar Ben Evans Committed by Greg Kroah-Hartman

staging: lustre: obdclass: style cleanup for obdo related functions

Change the style of lustre_get_wire_obdo and
lustre_set_wire_obdo to conform to linux kernel
standard.
Signed-off-by: default avatarBen Evans <bevans@cray.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: http://review.whamcloud.com/16917
Reviewed-on: http://review.whamcloud.com/19266Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e69d1ce
...@@ -139,7 +139,8 @@ void lustre_set_wire_obdo(const struct obd_connect_data *ocd, ...@@ -139,7 +139,8 @@ void lustre_set_wire_obdo(const struct obd_connect_data *ocd,
if (unlikely(!(ocd->ocd_connect_flags & OBD_CONNECT_FID)) && if (unlikely(!(ocd->ocd_connect_flags & OBD_CONNECT_FID)) &&
fid_seq_is_echo(ostid_seq(&lobdo->o_oi))) { fid_seq_is_echo(ostid_seq(&lobdo->o_oi))) {
/* Currently OBD_FL_OSTID will only be used when 2.4 echo /*
* Currently OBD_FL_OSTID will only be used when 2.4 echo
* client communicate with pre-2.4 server * client communicate with pre-2.4 server
*/ */
wobdo->o_oi.oi.oi_id = fid_oid(&lobdo->o_oi.oi_fid); wobdo->o_oi.oi.oi_id = fid_oid(&lobdo->o_oi.oi_fid);
...@@ -154,13 +155,13 @@ EXPORT_SYMBOL(lustre_set_wire_obdo); ...@@ -154,13 +155,13 @@ EXPORT_SYMBOL(lustre_set_wire_obdo);
void lustre_get_wire_obdo(const struct obd_connect_data *ocd, void lustre_get_wire_obdo(const struct obd_connect_data *ocd,
struct obdo *lobdo, const struct obdo *wobdo) struct obdo *lobdo, const struct obdo *wobdo)
{ {
__u32 local_flags = 0; u32 local_flags = 0;
if (lobdo->o_valid & OBD_MD_FLFLAGS) if (lobdo->o_valid & OBD_MD_FLFLAGS)
local_flags = lobdo->o_flags & OBD_FL_LOCAL_MASK; local_flags = lobdo->o_flags & OBD_FL_LOCAL_MASK;
*lobdo = *wobdo; *lobdo = *wobdo;
if (local_flags != 0) { if (local_flags) {
lobdo->o_valid |= OBD_MD_FLFLAGS; lobdo->o_valid |= OBD_MD_FLFLAGS;
lobdo->o_flags &= ~OBD_FL_LOCAL_MASK; lobdo->o_flags &= ~OBD_FL_LOCAL_MASK;
lobdo->o_flags |= local_flags; lobdo->o_flags |= local_flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment