More Lustre cleanups.
cover More Lustre cleanups.
From: Oleg Drokin <[email protected]>
This is another round of Lustre cleanups mostly aimed at fixing checkpatch warnings, but also removing
unneeded code and fixign other things I am noticing along the way.
Oleg Drokin (56):
staging/lustre/fld: Remove useless typedefs staging/lustre: Get rid of client_obd_lock_t typedef staging/lustre: Get rid of loc_flags_t typedef stagig/lustre: Get rid of cksum_type_t typedef staging/lustre: Get rid of ost_cmd_t typedef staging/lustre: Get rid of quota_cmd_t typedef staging/lustre: Get rid of mds_cmd_t typedef staging/lustre: Get rid of mds_reint_t, mdt_reint_t typedefs staging/lustre: Get rid of ldlm_cmd_t typedef staging/lustre: Remove ldlm typedefs
staging/lustre: Get rid of mgs_cmd_t typedef staging/lustre: Get rid of obd_cmd_t typedef staging/lustre: Get rid of llog_op_type typedef staging/lustre: Get rid of sec_cmd_t typedef staging/lustre/ldlm: Remove unused lr_most_restr from struct
ldlm_resource
staging/lustre: Get rid of object update code staging/lustre: Get rid of lustre_fid typedef staging/lustre: Get rid of lustre_quota_version typedef staging/lustre: Get rid of ldlm_error_t typedef staging/lustre: Remove ldlm_appetite_t typedef staging/lustre: Get rid of ldlm_ns_type_t typedef staging/lustre: Get rid of ldlm_cancel_flags_t typedef staging/lustre/llite: Get rid of se_stat_t typedef staging/lustre: Remove lustre_build_version.h staging/lustre: Get rid of C99 comments in lustre_idl.h staging/lustre: Remove server-side changelog defines staging/lustre: Remove FSF mailing address from GPL notices staging/lustre: Remove server-only values from enum lu_dirent_attrs staging/lustre: Remove *_CONNECT_SUPPORTED defines staging/lustre: Remove duplicated quota defines staging/lustre: Remove unused struct quota_body staging/lustre: Remove lquota_glb_rec, lquota_slv_rec and
lquota_acct_rec
staging/lustre: S_DIRSYNC is always defined in kernel staging/lustre: FMODE_READ and FMODE_WRITE are always defined in the
kernel
staging/lustre: Remvoe index file transfer structures staging/lustre: Remove server data from struct obd_export staging/lustre: Remove last_rcvd-file related data staging/lustre: Remove dead code in ldlm_lock_destroy_internal staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it. staging/lustre: Remove unused lli_open_count from struct ll_inode_info staging/lustre: Reformat comments and structures in lustre_idl.h staging/lustre/include: Adjust comment style staging/lustre/fld: Adjust comments to better conform to coding style staging/lustre/fid: Adjust comments to better conform to coding style staging/lustre/lclient: Adjust comments to better conform to coding
style
staging/lustre/ldlm: Adjust comments to better conform to coding style staging/lustre/llite: Adjust comments to better conform to coding
style
staging/lustre/lmv: Adjust comments to better conform to coding style staging/lustre/lov: Adjust comments to better conform to coding style staging/lustre/mdc: Adjust comments to better conform to coding style staging/lustre/mgc: Adjust comments to better conform to coding style staging/lustre/obdclass: Adjust comments to better conform to coding
style
staging/lustre/obdecho: Adjust comments to better conform to coding
style
staging/lustre/osc: Adjust comments to better conform to coding style staging/lustre/ptlrpc: Adjust comments to better conform to coding
style
staging/lustre: Fix indentation mistakes
.../lustre/include/linux/libcfs/libcfs_cpu.h | 5 - .../lustre/include/linux/libcfs/linux/linux-cpu.h | 5 - drivers/staging/lustre/lnet/lnet/lib-ptl.c | 5 - drivers/staging/lustre/lustre/fid/fid_request.c | 6 +- drivers/staging/lustre/lustre/fld/fld_cache.c | 9 +- drivers/staging/lustre/lustre/fld/fld_internal.h | 33 +- drivers/staging/lustre/lustre/fld/fld_request.c | 9 +- drivers/staging/lustre/lustre/include/cl_object.h | 69 +- drivers/staging/lustre/lustre/include/lclient.h | 3 +- drivers/staging/lustre/lustre/include/linux/obd.h | 12 +- .../staging/lustre/lustre/include/lprocfs_status.h | 31 +- drivers/staging/lustre/lustre/include/lu_object.h | 12 +- .../lustre/lustre/include/lustre/ll_fiemap.h | 63 +- .../lustre/include/lustre/lustre_build_version.h | 2 - .../lustre/lustre/include/lustre/lustre_idl.h | 731 ++++++--------------- .../lustre/lustre/include/lustre/lustre_user.h | 82 ++- drivers/staging/lustre/lustre/include/lustre_cfg.h | 9 +- .../staging/lustre/lustre/include/lustre_disk.h | 252 +------ drivers/staging/lustre/lustre/include/lustre_dlm.h | 111 ++-- .../lustre/lustre/include/lustre_dlm_flags.h | 51 +- .../staging/lustre/lustre/include/lustre_export.h | 73 +- drivers/staging/lustre/lustre/include/lustre_fid.h | 18 +- drivers/staging/lustre/lustre/include/lustre_fld.h | 33 +- .../staging/lustre/lustre/include/lustre_handles.h | 3 +- .../staging/lustre/lustre/include/lustre_import.h | 3 +- drivers/staging/lustre/lustre/include/lustre_lib.h | 3 +- drivers/staging/lustre/lustre/include/lustre_log.h | 3 +- drivers/staging/lustre/lustre/include/lustre_mdc.h | 6 +- drivers/staging/lustre/lustre/include/lustre_net.h | 41 +- .../lustre/lustre/include/lustre_req_layout.h | 9 - drivers/staging/lustre/lustre/include/obd.h | 76 ++- drivers/staging/lustre/lustre/include/obd_cksum.h | 21 +- drivers/staging/lustre/lustre/include/obd_class.h | 66 +- .../staging/lustre/lustre/include/obd_support.h | 18 +- drivers/staging/lustre/lustre/lclient/glimpse.c | 3 +- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 24 +- .../staging/lustre/lustre/lclient/lcommon_misc.c | 6 +- drivers/staging/lustre/lustre/ldlm/interval_tree.c | 6 +- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 14 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 51 +- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 15 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 35 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 110 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 46 +- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 159 +++-- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 46 +- drivers/staging/lustre/lustre/llite/dcache.c | 18 +- drivers/staging/lustre/lustre/llite/dir.c | 31 +- drivers/staging/lustre/lustre/llite/file.c | 182 +++-- drivers/staging/lustre/lustre/llite/llite_close.c | 18 +- .../staging/lustre/lustre/llite/llite_internal.h | 123 ++-- drivers/staging/lustre/lustre/llite/llite_lib.c | 89 ++- drivers/staging/lustre/lustre/llite/llite_mmap.c | 22 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 3 +- drivers/staging/lustre/lustre/llite/namei.c | 41 +- drivers/staging/lustre/lustre/llite/rw.c | 74 ++- drivers/staging/lustre/lustre/llite/rw26.c | 23 +- drivers/staging/lustre/lustre/llite/statahead.c | 46 +- drivers/staging/lustre/lustre/llite/super25.c | 6 +- drivers/staging/lustre/lustre/llite/symlink.c | 3 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 42 +- drivers/staging/lustre/lustre/llite/vvp_object.c | 3 +- drivers/staging/lustre/lustre/llite/vvp_page.c | 9 +- drivers/staging/lustre/lustre/llite/xattr.c | 15 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 8 +- drivers/staging/lustre/lustre/lmv/lmv_fld.c | 3 +- drivers/staging/lustre/lustre/lmv/lmv_intent.c | 9 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 56 +- drivers/staging/lustre/lustre/lov/lov_ea.c | 3 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 6 +- drivers/staging/lustre/lustre/lov/lov_lock.c | 32 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 86 ++- drivers/staging/lustre/lustre/lov/lov_object.c | 24 +- drivers/staging/lustre/lustre/lov/lov_offset.c | 12 +- drivers/staging/lustre/lustre/lov/lov_pack.c | 12 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 14 +- drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- drivers/staging/lustre/lustre/lov/lovsub_lock.c | 6 +- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 14 +- drivers/staging/lustre/lustre/mdc/mdc_lib.c | 3 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 103 +-- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 14 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 27 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 71 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 58 +- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 24 +- drivers/staging/lustre/lustre/obdclass/class_obd.c | 16 +- drivers/staging/lustre/lustre/obdclass/genops.c | 42 +- .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- drivers/staging/lustre/lustre/obdclass/llog.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 3 +- drivers/staging/lustre/lustre/obdclass/llog_swab.c | 3 +- .../lustre/lustre/obdclass/lprocfs_counters.c | 6 +- .../lustre/lustre/obdclass/lprocfs_status.c | 2 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 3 +- .../lustre/lustre/obdclass/lustre_handles.c | 3 +- .../staging/lustre/lustre/obdclass/lustre_peer.c | 3 +- .../staging/lustre/lustre/obdclass/obd_config.c | 44 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 67 +- drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- .../staging/lustre/lustre/obdecho/echo_client.c | 9 +- .../staging/lustre/lustre/obdecho/echo_internal.h | 5 - drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +- drivers/staging/lustre/lustre/osc/osc_cache.c | 168 +++-- .../staging/lustre/lustre/osc/osc_cl_internal.h | 37 +- drivers/staging/lustre/lustre/osc/osc_internal.h | 8 +- drivers/staging/lustre/lustre/osc/osc_io.c | 6 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 45 +- drivers/staging/lustre/lustre/osc/osc_page.c | 42 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 21 +- drivers/staging/lustre/lustre/osc/osc_request.c | 171 +++-- drivers/staging/lustre/lustre/ptlrpc/connection.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/events.c | 51 +- drivers/staging/lustre/lustre/ptlrpc/import.c | 114 ++-- drivers/staging/lustre/lustre/ptlrpc/layout.c | 82 --- drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 8 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 10 +- drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 42 +- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 6 +- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 75 +-- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 11 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 - drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 9 +- drivers/staging/lustre/lustre/ptlrpc/recover.c | 18 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 27 +- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 117 ++-- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 272 -------- 131 files changed, 2608 insertions(+), 2723 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h
Signature · 1 line
2.1.0
PATCH 1/56 staging/lustre/fld: Remove useless typedefs
From: Oleg Drokin <[email protected]>
Typedefs fld_hash_func_t and fld_scan_func_t are used exectly once in the following structure so don't really help anything at all.
--- drivers/staging/lustre/lustre/fld/fld_internal.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/staging/lustre/lustre/fld/fld_internal.h +2 -7
@@ -58,15 +58,10 @@ struct fld_stats {__u64 fst_inflight; }; -typedef int (*fld_hash_func_t ) (struct lu_client_fld *,__u64 ); - -typedef struct lu_fld_target * -(*fld_scan_func_t ) (struct lu_client_fld *,__u64 ); -struct lu_fld_hash {const char *fh_name; -fld_hash_func_t fh_hash_func; -fld_scan_func_t fh_scan_func; +int (*fh_hash_func)(struct lu_client_fld *,__u64 ); +struct lu_fld_target *(*fh_scan_func)(struct lu_client_fld *,__u64 ); };struct fld_cache_entry {
Signature · 1 line
2.1.0
PATCH 2/56 staging/lustre: Get rid of client_obd_lock_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with struct client_obd_lock
--- drivers/staging/lustre/lustre/include/linux/obd.h | 12 ++++++------ drivers/staging/lustre/lustre/include/obd.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/lustre/lustre/include/linux/obd.h +6 -6
@@ -57,16 +57,16 @@ struct ll_iattr {#define CLIENT_OBD_LIST_LOCK_DEBUG 1 -typedef struct { +struct client_obd_lock {spinlock_t lock;unsigned long time;struct task_struct *task;const char *func;int line; -}client_obd_lock_t ; +}; -static inline void __client_obd_list_lock (client_obd_lock_t *lock, +static inline void __client_obd_list_lock (struct client_obd_lock *lock,const char *func,int line) {unsigned long cur = jiffies;
@@ -106,7 +106,7 @@ static inline void __client_obd_list_lock(client_obd_lock_t *lock,#define client_obd_list_lock (lock) \ __client_obd_list_lock(lock, __func__, __LINE__) -static inline void client_obd_list_unlock (client_obd_lock_t *lock) +static inline void client_obd_list_unlock (struct client_obd_lock *lock) {LASSERT (lock->task); lock->task =NULL ;
@@ -114,12 +114,12 @@ static inline void client_obd_list_unlock(client_obd_lock_t *lock) spin_unlock(&lock->lock); } -static inline void client_obd_list_lock_init (client_obd_lock_t *lock) +static inline void client_obd_list_lock_init (struct client_obd_lock *lock) {spin_lock_init (&lock->lock); } -static inline void client_obd_list_lock_done (client_obd_lock_t *lock) +static inline void client_obd_list_lock_done (struct client_obd_lock *lock) {}#endif /* __LINUX_OBD_H */
drivers/staging/lustre/lustre/include/obd.h +2 -2
@@ -294,7 +294,7 @@ struct client_obd {* NB by Jinshan: though field names are still _loi_, but actually * osc_object{}s are in the list. */ -client_obd_lock_t cl_loi_list_lock; +struct client_obd_lock cl_loi_list_lock;struct list_head cl_loi_ready_list;struct list_head cl_loi_hp_ready_list;struct list_head cl_loi_write_list;
@@ -321,7 +321,7 @@ struct client_obd {atomic_t cl_lru_shrinkers;atomic_t cl_lru_in_list;struct list_head cl_lru_list;/* lru page list */ -client_obd_lock_t cl_lru_list_lock;/* page list protector */ +struct client_obd_lock cl_lru_list_lock;/* page list protector */ /* number of in flight destroy rpcs is limited to max_rpcs_in_flight */ atomic_t cl_destroy_in_flight;
Signature · 1 line
2.1.0
PATCH 3/56 staging/lustre: Get rid of loc_flags_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with direct reference of enum loc_flags
--- drivers/staging/lustre/lustre/include/lu_object.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/lustre/lustre/include/lu_object.h +3 -3
@@ -164,11 +164,11 @@ struct lu_device_operations {/** * For lu_object_conf flags */ -typedef enum { +enum loc_flags {/* This is a new object to be allocated, or the file * corresponding to the object does not exists. */ LOC_F_NEW =0x00000001 , -}loc_flags_t ; +};/** * Object configuration, describing particulars of object being created. On
@@ -179,7 +179,7 @@ struct lu_object_conf {/** * Some hints for obj find and alloc. */ -loc_flags_t loc_flags; +enum loc_flags loc_flags; };/**
Signature · 1 line
2.1.0
PATCH 4/56 stagig/lustre: Get rid of cksum_type_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum cksum_type
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- drivers/staging/lustre/lustre/include/obd.h | 2 +- drivers/staging/lustre/lustre/include/obd_cksum.h | 12 ++++++------ drivers/staging/lustre/lustre/osc/osc_request.c | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -1408,11 +1408,11 @@ void lustre_swab_connect(struct obd_connect_data *ocd);* Please update DECLARE_CKSUM_NAME/OBD_CKSUM_ALL in obd.h when adding a new * algorithm and also the OBD_FL_CKSUM* flags. */ -typedef enum { +enum cksum_type {OBD_CKSUM_CRC32 =0x00000001 ,OBD_CKSUM_ADLER =0x00000002 ,OBD_CKSUM_CRC32C =0x00000004 , -}cksum_type_t ; +};/* * OST requests: OBDO & OBD request records
drivers/staging/lustre/lustre/include/obd.h +1 -1
@@ -339,7 +339,7 @@ struct client_obd {/* supported checksum types that are worked out at connect time */ __u32 cl_supp_cksum_types;/* checksum algorithm to be used */ -cksum_type_t cl_cksum_type; +enum cksum_type cl_cksum_type;/* also protected by the poorly named _loi_list_lock lock above */ struct osc_async_rc cl_ar;
drivers/staging/lustre/lustre/include/obd_cksum.h +6 -6
@@ -37,7 +37,7 @@#include "../../include/linux/libcfs/libcfs.h" #include "lustre/lustre_idl.h" -static inline unsigned char cksum_obd2cfs (cksum_type_t cksum_type) +static inline unsigned char cksum_obd2cfs (enum cksum_type cksum_type) {switch (cksum_type) {case OBD_CKSUM_CRC32 :
@@ -64,7 +64,7 @@ static inline unsigned char cksum_obd2cfs(cksum_type_t cksum_type)* because that is supported by all clients since 1.8 * * In case multiple algorithms are supported the best one is used. */ -static inline u32 cksum_type_pack (cksum_type_t cksum_type) +static inline u32 cksum_type_pack (enum cksum_type cksum_type) {unsigned int performance =0 , tmp;u32 flag =OBD_FL_CKSUM_ADLER ;
@@ -98,7 +98,7 @@ static inline u32 cksum_type_pack(cksum_type_t cksum_type)return flag; } -static inline cksum_type_t cksum_type_unpack (u32 o_flags) +static inline enum cksum_type cksum_type_unpack (u32 o_flags) {switch (o_flags &OBD_FL_CKSUM_ALL ) {case OBD_FL_CKSUM_CRC32C :
@@ -116,9 +116,9 @@ static inline cksum_type_t cksum_type_unpack(u32 o_flags)* 1.8 supported ADLER it is base and not depend on hw * Client uses all available local algos */ -static inline cksum_type_t cksum_types_supported_client (void ) +static inline enum cksum_type cksum_types_supported_client (void ) { -cksum_type_t ret =OBD_CKSUM_ADLER ; +enum cksum_type ret =OBD_CKSUM_ADLER ; CDEBUG(D_INFO, "Crypto hash speed: crc %d, crc32c %d, adler %d\n", cfs_crypto_hash_speed(cksum_obd2cfs(OBD_CKSUM_CRC32)),
@@ -140,7 +140,7 @@ static inline cksum_type_t cksum_types_supported_client(void)* checksum type due to its benchmarking at libcfs module load. * Caution is advised, however, since what is fastest on a single client may * not be the fastest or most efficient algorithm on the server. */ -static inline cksum_type_t cksum_type_select (cksum_type_t cksum_types) +static inline enum cksum_type cksum_type_select (enum cksum_type cksum_types) {return cksum_type_unpack (cksum_type_pack (cksum_types)); }
drivers/staging/lustre/lustre/osc/osc_request.c +5 -5
@@ -1151,7 +1151,7 @@ static inline int can_merge_pages(struct brw_page *p1, struct brw_page *p2)static u32 osc_checksum_bulk (int nob,u32 pg_count,struct brw_page **pga,int opc, -cksum_type_t cksum_type) +enum cksum_type cksum_type) {__u32 cksum;int i =0 ;
@@ -1355,7 +1355,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli, !sptlrpc_flavor_has_bulk(&req->rq_flvr)) {/* store cl_cksum_type in a local variable since * it can be changed via lprocfs */ -cksum_type_t cksum_type = cli->cl_cksum_type; +enum cksum_type cksum_type = cli->cl_cksum_type;if ((body->oa.o_valid &OBD_MD_FLFLAGS ) ==0 ) { oa->o_flags &=OBD_FL_LOCAL_MASK ;
@@ -1414,11 +1414,11 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,static int check_write_checksum (struct obdo *oa,const lnet_process_id_t *peer,__u32 client_cksum,__u32 server_cksum,int nob,u32 page_count,struct brw_page **pga, -cksum_type_t client_cksum_type) +enum cksum_type client_cksum_type) {__u32 new_cksum;char *msg; -cksum_type_t cksum_type; +enum cksum_type cksum_type;if (server_cksum == client_cksum) {CDEBUG (D_PAGE ,"checksum %x confirmed\n" , client_cksum);
@@ -1549,7 +1549,7 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)__u32 server_cksum = body->oa.o_cksum;char *via ="" ;char *router ="" ; -cksum_type_t cksum_type; +enum cksum_type cksum_type; cksum_type =cksum_type_unpack (body->oa.o_valid&OBD_MD_FLFLAGS ? body->oa.o_flags :0 );
Signature · 1 line
2.1.0
PATCH 5/56 staging/lustre: Get rid of ost_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ost_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -1419,7 +1419,7 @@ enum cksum_type {*/ /* opcodes */ -typedef enum { +enum ost_cmd {OST_REPLY =0 ,/* reply ? */ OST_GETATTR =1 ,OST_SETATTR =2 ,
@@ -1440,7 +1440,7 @@ typedef enum {OST_QUOTACTL =19 ,OST_QUOTA_ADJUST_QUNIT =20 ,/* not used since 2.4 */ OST_LAST_OPC -} ost_cmd_t; +};#define OST_FIRST_OPC OST_REPLY enum obdo_flags {
Signature · 1 line
2.1.0
PATCH 6/56 staging/lustre: Get rid of quota_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum quota_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2006,11 +2006,11 @@ void lustre_swab_lquota_lvb(struct lquota_lvb *lvb);#define lvb_glb_ver lvb_id_may_rel/* current version of the global index */ /* op codes */ -typedef enum { +enum quota_cmd {QUOTA_DQACQ =601 ,QUOTA_DQREL =602 ,QUOTA_LAST_OPC -}quota_cmd_t ; +};#define QUOTA_FIRST_OPC QUOTA_DQACQ/*
Signature · 1 line
2.1.0
PATCH 7/56 staging/lustre: Get rid of mds_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum mds_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2018,7 +2018,7 @@ enum quota_cmd {*/ /* opcodes */ -typedef enum { +enum mds_cmd {MDS_GETATTR =33 ,MDS_GETATTR_NAME =34 ,MDS_CLOSE =35 ,
@@ -2049,7 +2049,7 @@ typedef enum {MDS_HSM_CT_UNREGISTER =60 ,MDS_SWAP_LAYOUTS =61 , MDS_LAST_OPC -} mds_cmd_t; +};#define MDS_FIRST_OPC MDS_GETATTR
Signature · 1 line
2.1.0
PATCH 8/56 staging/lustre: Get rid of mds_reint_t, mdt_reint_t typedefs
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace with enum mdt_reint_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2065,7 +2065,7 @@ typedef enum {* Do not exceed 63 */ -typedef enum { +enum mdt_reint_cmd {REINT_SETATTR =1 ,REINT_CREATE =2 ,REINT_LINK =3 ,
@@ -2076,7 +2076,7 @@ typedef enum {REINT_RMENTRY =8 ,// REINT_WRITE = 9, REINT_MAX -} mds_reint_t, mdt_reint_t; +};void lustre_swab_generic_32s (__u32 *val);
Signature · 1 line
2.1.0
PATCH 9/56 staging/lustre: Get rid of ldlm_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ldlm_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2659,7 +2659,7 @@ void lustre_swab_lov_desc(struct lov_desc *ld);* LDLM requests: */ /* opcodes -- MUST be distinct from OST/MDS opcodes */ -typedef enum { +enum ldlm_cmd {LDLM_ENQUEUE =101 ,LDLM_CONVERT =102 ,LDLM_CANCEL =103 ,
@@ -2668,7 +2668,7 @@ typedef enum {LDLM_GL_CALLBACK =106 ,LDLM_SET_INFO =107 , LDLM_LAST_OPC -} ldlm_cmd_t; +};#define LDLM_FIRST_OPC LDLM_ENQUEUE#define RES_NAME_SIZE 4
Signature · 1 line
2.1.0
PATCH 10/56 staging/lustre: Remove ldlm type/mode typedefs
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace ldlm_mode_t with enum ldlm_mode,ldlm_type_t with enum ldlm_type
--- .../lustre/lustre/include/lustre/lustre_idl.h | 14 ++++---- drivers/staging/lustre/lustre/include/lustre_dlm.h | 39 ++++++++++++---------- drivers/staging/lustre/lustre/include/lustre_net.h | 2 +- drivers/staging/lustre/lustre/include/obd.h | 10 +++--- drivers/staging/lustre/lustre/include/obd_class.h | 14 ++++---- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 4 +-- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 28 ++++++++-------- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 7 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +- drivers/staging/lustre/lustre/llite/dir.c | 2 +- drivers/staging/lustre/lustre/llite/file.c | 19 ++++++----- .../staging/lustre/lustre/llite/llite_internal.h | 8 ++--- drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 2 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 17 ++++++---- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 12 +++---- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 14 ++++---- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 2 +- .../staging/lustre/lustre/osc/osc_cl_internal.h | 4 +-- drivers/staging/lustre/lustre/osc/osc_request.c | 8 ++--- 23 files changed, 114 insertions(+), 103 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +7 -7
@@ -2687,7 +2687,7 @@ static inline int ldlm_res_eq(const struct ldlm_res_id *res0, }/* lock types */ -typedef enum { +enum ldlm_mode {LCK_MINMODE =0 ,LCK_EX =1 ,LCK_PW =2 ,
@@ -2698,17 +2698,17 @@ typedef enum {LCK_GROUP =64 ,LCK_COS =128 , LCK_MAXMODE -} ldlm_mode_t; +};#define LCK_MODE_NUM 8 -typedef enum { +enum ldlm_type {LDLM_PLAIN =10 ,LDLM_EXTENT =11 ,LDLM_FLOCK =12 ,LDLM_IBITS =13 ,LDLM_MAX_TYPE -}ldlm_type_t ; +};#define LDLM_MIN_TYPE LDLM_PLAIN
@@ -2768,15 +2768,15 @@ struct ldlm_intent {void lustre_swab_ldlm_intent (struct ldlm_intent *i);struct ldlm_resource_desc { -ldlm_type_t lr_type; +enum ldlm_type lr_type;__u32 lr_padding;/* also fix lustre_swab_ldlm_resource_desc */ struct ldlm_res_id lr_name; };struct ldlm_lock_desc {struct ldlm_resource_desc l_resource; -ldlm_mode_t l_req_mode; -ldlm_mode_t l_granted_mode; +enum ldlm_mode l_req_mode; +enum ldlm_mode l_granted_mode;ldlm_wire_policy_data_t l_policy_data; };
drivers/staging/lustre/lustre/include/lustre_dlm.h +21 -18
@@ -145,14 +145,15 @@ typedef enum {#define LCK_COMPAT_COS (LCK_COS)/** @} Lock Compatibility Matrix */ -extern ldlm_mode_t lck_compat_array[]; +extern enum ldlm_mode lck_compat_array[]; -static inline void lockmode_verify (ldlm_mode_t mode) +static inline void lockmode_verify (enum ldlm_mode mode) {LASSERT (mode >LCK_MINMODE && mode <LCK_MAXMODE ); } -static inline int lockmode_compat (ldlm_mode_t exist_mode,ldlm_mode_t new_mode) +static inline int lockmode_compat (enum ldlm_mode exist_mode, +enum ldlm_mode new_mode) {return (lck_compat_array[exist_mode] & new_mode); }
@@ -524,7 +525,7 @@ struct ldlm_interval {struct ldlm_interval_tree {/** Tree size. */ int lit_size; -ldlm_mode_t lit_mode;/* lock mode */ +enum ldlm_mode lit_mode;/* lock mode */ struct interval_node *lit_root;/* actual ldlm_interval */ };
@@ -556,7 +557,7 @@ typedef union {struct ldlm_inodebits l_inodebits; } ldlm_policy_data_t; -void ldlm_convert_policy_to_local (struct obd_export *exp,ldlm_type_t type, +void ldlm_convert_policy_to_local (struct obd_export *exp,enum ldlm_type type,const ldlm_wire_policy_data_t *wpolicy,ldlm_policy_data_t *lpolicy);
@@ -634,11 +635,11 @@ struct ldlm_lock {* Requested mode. * Protected by lr_lock. */ -ldlm_mode_t l_req_mode; +enum ldlm_mode l_req_mode;/** * Granted mode, also protected by lr_lock. */ -ldlm_mode_t l_granted_mode; +enum ldlm_mode l_granted_mode;/** Lock completion handler pointer. Called when lock is granted. */ ldlm_completion_callback l_completion_ast;/**
@@ -851,7 +852,7 @@ struct ldlm_resource {ldlm_mode_t lr_most_restr;/** Type of locks this resource can hold. Only one type per resource. */ -ldlm_type_t lr_type;/* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */ +enum ldlm_type lr_type;/* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */ /** Resource name */ struct ldlm_res_id lr_name;
@@ -1164,12 +1165,13 @@ void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode);void ldlm_lock_fail_match_locked (struct ldlm_lock *lock);void ldlm_lock_allow_match (struct ldlm_lock *lock);void ldlm_lock_allow_match_locked (struct ldlm_lock *lock); -ldlm_mode_t ldlm_lock_match (struct ldlm_namespace *ns,__u64 flags, -const struct ldlm_res_id *,ldlm_type_t type, -ldlm_policy_data_t *,ldlm_mode_t mode, -struct lustre_handle *,int unref); -ldlm_mode_t ldlm_revalidate_lock_handle (struct lustre_handle *lockh, -__u64 *bits); +enum ldlm_mode ldlm_lock_match (struct ldlm_namespace *ns,__u64 flags, +const struct ldlm_res_id *, +enum ldlm_type type,ldlm_policy_data_t *, +enum ldlm_mode mode,struct lustre_handle *, +int unref); +enum ldlm_mode ldlm_revalidate_lock_handle (struct lustre_handle *lockh, +__u64 *bits);void ldlm_lock_cancel (struct ldlm_lock *lock);void ldlm_lock_dump_handle (int level,struct lustre_handle *);void ldlm_unlink_lock_skiplist (struct ldlm_lock *req);
@@ -1189,7 +1191,7 @@ void ldlm_debugfs_cleanup(void);struct ldlm_resource *ldlm_resource_get (struct ldlm_namespace *ns,struct ldlm_resource *parent,const struct ldlm_res_id *, -ldlm_type_t type,int create); +enum ldlm_type type,int create);int ldlm_resource_putref (struct ldlm_resource *res); void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
@@ -1240,7 +1242,8 @@ int ldlm_prep_elc_req(struct obd_export *exp, struct list_head *cancels, int count);int ldlm_cli_enqueue_fini (struct obd_export *exp,struct ptlrpc_request *req, -ldlm_type_t type,__u8 with_policy,ldlm_mode_t mode, +enum ldlm_type type,__u8 with_policy, +enum ldlm_mode mode,__u64 *flags,void *lvb,__u32 lvb_len,struct lustre_handle *lockh,int rc);int ldlm_cli_update_pool (struct ptlrpc_request *req);
@@ -1251,13 +1254,13 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *,int ldlm_cli_cancel_unused_resource (struct ldlm_namespace *ns,const struct ldlm_res_id *res_id,ldlm_policy_data_t *policy, -ldlm_mode_t mode, +enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque);int ldlm_cancel_resource_local (struct ldlm_resource *res,struct list_head *cancels,ldlm_policy_data_t *policy, -ldlm_mode_t mode,__u64 lock_flags, +enum ldlm_mode mode,__u64 lock_flags,ldlm_cancel_flags_t cancel_flags,void *opaque);int ldlm_cli_cancel_list_local (struct list_head *cancels,int count,ldlm_cancel_flags_t flags);
drivers/staging/lustre/lustre/include/lustre_net.h +1 -1
@@ -463,7 +463,7 @@ struct ptlrpc_reply_state {/** Handles of locks awaiting client reply ACK */ struct lustre_handle rs_locks[RS_MAX_LOCKS ];/** Lock modes of locks in \a rs_locks */ -ldlm_mode_t rs_modes[RS_MAX_LOCKS ]; +enum ldlm_mode rs_modes[RS_MAX_LOCKS ]; };struct ptlrpc_thread ;
drivers/staging/lustre/lustre/include/obd.h +5 -5
@@ -1160,13 +1160,13 @@ struct md_ops { struct obd_client_handle *);int (*set_lock_data)(struct obd_export *,__u64 *,void *,__u64 *); -ldlm_mode_t (*lock_match)(struct obd_export *,__u64 , -const struct lu_fid *,ldlm_type_t , -ldlm_policy_data_t *,ldlm_mode_t , -struct lustre_handle *); +enum ldlm_mode (*lock_match)(struct obd_export *,__u64 , +const struct lu_fid *,enum ldlm_type , +ldlm_policy_data_t *,enum ldlm_mode , +struct lustre_handle *);int (*cancel_unused)(struct obd_export *,const struct lu_fid *, -ldlm_policy_data_t *,ldlm_mode_t , +ldlm_policy_data_t *,enum ldlm_mode ,ldlm_cancel_flags_t flags,void *opaque); int (*get_remote_perm)(struct obd_export *, const struct lu_fid *,
drivers/staging/lustre/lustre/include/obd_class.h +7 -7
@@ -1656,7 +1656,7 @@ static inline int md_set_lock_data(struct obd_export *exp,static inline int md_cancel_unused (struct obd_export *exp,const struct lu_fid *fid,ldlm_policy_data_t *policy, -ldlm_mode_t mode, +enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque) {
@@ -1670,12 +1670,12 @@ static inline int md_cancel_unused(struct obd_export *exp,return rc; } -static inline ldlm_mode_t md_lock_match (struct obd_export *exp,__u64 flags, -const struct lu_fid *fid, -ldlm_type_t type, -ldlm_policy_data_t *policy, -ldlm_mode_t mode, -struct lustre_handle *lockh) +static inline enum ldlm_mode md_lock_match (struct obd_export *exp,__u64 flags, +const struct lu_fid *fid, +enum ldlm_type type, +ldlm_policy_data_t *policy, +enum ldlm_mode mode, +struct lustre_handle *lockh) {EXP_CHECK_MD_OP (exp, lock_match);EXP_MD_COUNTER_INCREMENT (exp, lock_match);
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +1 -1
@@ -144,7 +144,7 @@ struct ldlm_interval *ldlm_interval_detach(struct ldlm_lock *l)return list_empty (&n->li_group) ? n :NULL ; } -static inline int lock_mode_to_index (ldlm_mode_t mode) +static inline int lock_mode_to_index (enum ldlm_mode mode) {int index;
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +2 -2
@@ -92,7 +92,7 @@ ldlm_flocks_overlap(struct ldlm_lock *lock, struct ldlm_lock *new) }static inline void -ldlm_flock_destroy (struct ldlm_lock *lock,ldlm_mode_t mode,__u64 flags) +ldlm_flock_destroy (struct ldlm_lock *lock,enum ldlm_mode mode,__u64 flags) {LDLM_DEBUG (lock,"ldlm_flock_destroy(mode: %d, flags: 0x%llx)" , mode, flags);
@@ -143,7 +143,7 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,struct ldlm_lock *lock =NULL ;struct ldlm_lock *new = req;struct ldlm_lock *new2 =NULL ; -ldlm_mode_t mode = req->l_req_mode; +enum ldlm_mode mode = req->l_req_mode;int added = (mode ==LCK_NL );int overlaps =0 ;int splitted =0 ;
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +1 -1
@@ -133,7 +133,7 @@ int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill, enum req_location loc, void *data, int size);struct ldlm_lock *ldlm_lock_create (struct ldlm_namespace *ns,const struct ldlm_res_id *, -ldlm_type_t type,ldlm_mode_t , +enum ldlm_type type,enum ldlm_mode mode,const struct ldlm_callback_suite *cbs,void *data,__u32 lvb_len,enum lvb_type lvb_type); ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *, struct ldlm_lock **,
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +1 -1
@@ -718,7 +718,7 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id) }EXPORT_SYMBOL (target_send_reply); -ldlm_mode_t lck_compat_array[] = { +enum ldlm_mode lck_compat_array[] = { [LCK_EX ] =LCK_COMPAT_EX , [LCK_PW ] =LCK_COMPAT_PW , [LCK_PR ] =LCK_COMPAT_PR ,
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +15 -13
@@ -91,7 +91,7 @@ static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = {/** * Converts lock policy from local format to on the wire lock_desc format */ -static void ldlm_convert_policy_to_wire (ldlm_type_t type, +static void ldlm_convert_policy_to_wire (enum ldlm_type type,const ldlm_policy_data_t *lpolicy,ldlm_wire_policy_data_t *wpolicy) {
@@ -105,7 +105,7 @@ static void ldlm_convert_policy_to_wire(ldlm_type_t type,/** * Converts lock policy from on the wire lock_desc format to local format */ -void ldlm_convert_policy_to_local (struct obd_export *exp,ldlm_type_t type, +void ldlm_convert_policy_to_local (struct obd_export *exp,enum ldlm_type type,const ldlm_wire_policy_data_t *wpolicy,ldlm_policy_data_t *lpolicy) {
@@ -1049,7 +1049,7 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)* comment above ldlm_lock_match */ static struct ldlm_lock *search_queue (struct list_head *queue, -ldlm_mode_t *mode, +enum ldlm_mode *mode,ldlm_policy_data_t *policy,struct ldlm_lock *old_lock,__u64 flags,int unref)
@@ -1058,7 +1058,7 @@ static struct ldlm_lock *search_queue(struct list_head *queue,struct list_head *tmp;list_for_each (tmp, queue) { -ldlm_mode_t match; +enum ldlm_mode match; lock = list_entry(tmp, struct ldlm_lock, l_res_link);
@@ -1191,10 +1191,12 @@ EXPORT_SYMBOL(ldlm_lock_allow_match);* keep caller code unchanged), the context failure will be discovered by * caller sometime later. */ -ldlm_mode_t ldlm_lock_match (struct ldlm_namespace *ns,__u64 flags, -const struct ldlm_res_id *res_id,ldlm_type_t type, -ldlm_policy_data_t *policy,ldlm_mode_t mode, -struct lustre_handle *lockh,int unref) +enum ldlm_mode ldlm_lock_match (struct ldlm_namespace *ns,__u64 flags, +const struct ldlm_res_id *res_id, +enum ldlm_type type, +ldlm_policy_data_t *policy, +enum ldlm_mode mode, +struct lustre_handle *lockh,int unref) {struct ldlm_resource *res;struct ldlm_lock *lock, *old_lock =NULL ;
@@ -1316,11 +1318,11 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, }EXPORT_SYMBOL (ldlm_lock_match); -ldlm_mode_t ldlm_revalidate_lock_handle (struct lustre_handle *lockh, -__u64 *bits) +enum ldlm_mode ldlm_revalidate_lock_handle (struct lustre_handle *lockh, +__u64 *bits) {struct ldlm_lock *lock; -ldlm_mode_t mode =0 ; +enum ldlm_mode mode =0 ; lock =ldlm_handle2lock (lockh);if (lock) {
@@ -1452,8 +1454,8 @@ int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill,*/ struct ldlm_lock *ldlm_lock_create (struct ldlm_namespace *ns,const struct ldlm_res_id *res_id, -ldlm_type_t type, -ldlm_mode_t mode, +enum ldlm_type type, +enum ldlm_mode mode,const struct ldlm_callback_suite *cbs,void *data,__u32 lvb_len,enum lvb_type lvb_type)
drivers/staging/lustre/lustre/ldlm/ldlm_request.c +4 -3
@@ -331,7 +331,8 @@ static void failed_lock_cleanup(struct ldlm_namespace *ns,* Called after receiving reply from server. */ int ldlm_cli_enqueue_fini (struct obd_export *exp,struct ptlrpc_request *req, -ldlm_type_t type,__u8 with_policy,ldlm_mode_t mode, +enum ldlm_type type,__u8 with_policy, +enum ldlm_mode mode,__u64 *flags,void *lvb,__u32 lvb_len,struct lustre_handle *lockh,int rc) {
@@ -1465,7 +1466,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,int ldlm_cancel_resource_local (struct ldlm_resource *res,struct list_head *cancels,ldlm_policy_data_t *policy, -ldlm_mode_t mode,__u64 lock_flags, +enum ldlm_mode mode,__u64 lock_flags,ldlm_cancel_flags_t cancel_flags,void *opaque) {struct ldlm_lock *lock;
@@ -1578,7 +1579,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list);int ldlm_cli_cancel_unused_resource (struct ldlm_namespace *ns,const struct ldlm_res_id *res_id,ldlm_policy_data_t *policy, -ldlm_mode_t mode, +enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque) {
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +2 -1
@@ -1065,7 +1065,8 @@ static struct ldlm_resource *ldlm_resource_new(void)*/ struct ldlm_resource *ldlm_resource_get (struct ldlm_namespace *ns,struct ldlm_resource *parent, -const struct ldlm_res_id *name,ldlm_type_t type,int create) +const struct ldlm_res_id *name,enum ldlm_type type, +int create) {struct hlist_node *hnode;struct ldlm_resource *res;
drivers/staging/lustre/lustre/llite/dir.c +1 -1
@@ -332,7 +332,7 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash,struct lustre_handle lockh;struct lu_dirpage *dp;struct page *page; -ldlm_mode_t mode; +enum ldlm_mode mode;int rc;__u64 start =0 ;__u64 end =0 ;
drivers/staging/lustre/lustre/llite/file.c +10 -9
@@ -2780,11 +2780,12 @@ ll_file_noflock(struct file *file, int cmd, struct file_lock *file_lock)* \param l_req_mode [IN] searched lock mode * \retval boolean, true iff all bits are found */ -int ll_have_md_lock (struct inode *inode,__u64 *bits,ldlm_mode_t l_req_mode) +int ll_have_md_lock (struct inode *inode,__u64 *bits, +enum ldlm_mode l_req_mode) {struct lustre_handle lockh;ldlm_policy_data_t policy; -ldlm_mode_t mode = (l_req_mode ==LCK_MINMODE ) ? +enum ldlm_mode mode = (l_req_mode ==LCK_MINMODE ) ? (LCK_CR |LCK_CW |LCK_PR |LCK_PW ) : l_req_mode;struct lu_fid *fid;__u64 flags;
@@ -2820,13 +2821,13 @@ int ll_have_md_lock(struct inode *inode, __u64 *bits, ldlm_mode_t l_req_mode)return *bits ==0 ; } -ldlm_mode_t ll_take_md_lock (struct inode *inode,__u64 bits, -struct lustre_handle *lockh,__u64 flags, -ldlm_mode_t mode) +enum ldlm_mode ll_take_md_lock (struct inode *inode,__u64 bits, +struct lustre_handle *lockh,__u64 flags, +enum ldlm_mode mode) {ldlm_policy_data_t policy = { .l_inodebits = {bits} };struct lu_fid *fid; -ldlm_mode_t rc; +enum ldlm_mode rc; fid = &ll_i2info (inode)->lli_fid;CDEBUG (D_INFO ,"trying to match res " DFID "\n" ,PFID (fid));
@@ -3356,8 +3357,8 @@ out:* Apply the layout to the inode. Layout lock is held and will be released * in this function. */ -static int ll_layout_lock_set (struct lustre_handle *lockh,ldlm_mode_t mode, -struct inode *inode,__u32 *gen,bool reconf) +static int ll_layout_lock_set (struct lustre_handle *lockh,enum ldlm_mode mode, +struct inode *inode,__u32 *gen,bool reconf) {struct ll_inode_info *lli =ll_i2info (inode);struct ll_sb_info *sbi =ll_i2sbi (inode);
@@ -3479,7 +3480,7 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen)struct md_op_data *op_data;struct lookup_intent it;struct lustre_handle lockh; -ldlm_mode_t mode; +enum ldlm_mode mode;struct ldlm_enqueue_info einfo = { .ei_type =LDLM_IBITS , .ei_mode =LCK_CR ,
drivers/staging/lustre/lustre/llite/llite_internal.h +4 -4
@@ -705,10 +705,10 @@ extern struct file_operations ll_file_operations_flock;extern struct file_operations ll_file_operations_noflock;extern const struct inode_operations ll_file_inode_operations;int ll_have_md_lock (struct inode *inode,__u64 *bits, -ldlm_mode_t l_req_mode); -ldlm_mode_t ll_take_md_lock (struct inode *inode,__u64 bits, -struct lustre_handle *lockh,__u64 flags, -ldlm_mode_t mode); +enum ldlm_mode l_req_mode); +enum ldlm_mode ll_take_md_lock (struct inode *inode,__u64 bits, +struct lustre_handle *lockh,__u64 flags, +enum ldlm_mode mode);int ll_file_open (struct inode *inode,struct file *file);int ll_file_release (struct inode *inode,struct file *file); int ll_glimpse_ioctl(struct ll_sb_info *sbi,
drivers/staging/lustre/lustre/llite/llite_lib.c +1 -1
@@ -1598,7 +1598,7 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md)if (exp_connect_som (ll_i2mdexp (inode)) &&S_ISREG (inode->i_mode)) {struct lustre_handle lockh; -ldlm_mode_t mode; +enum ldlm_mode mode;/* As it is possible a blocking ast has been processed * by this time, we need to check there is an UPDATE
drivers/staging/lustre/lustre/llite/xattr_cache.c +1 -1
@@ -266,7 +266,7 @@ static int ll_xattr_find_get_lock(struct inode *inode,struct lookup_intent *oit, struct ptlrpc_request **req) { - ldlm_mode_t mode; + enum ldlm_mode mode;struct lustre_handle lockh = {0 };struct md_op_data *op_data;struct ll_inode_info *lli =ll_i2info (inode);
drivers/staging/lustre/lustre/lmv/lmv_obd.c +10 -7
@@ -1846,7 +1846,8 @@ lmv_getattr_name(struct obd_export *exp, struct md_op_data *op_data, NULL)static int lmv_early_cancel (struct obd_export *exp,struct md_op_data *op_data, -int op_tgt,ldlm_mode_t mode,int bits,int flag) +int op_tgt,enum ldlm_mode mode,int bits, +int flag) {struct lu_fid *fid =md_op_data_fid (op_data, flag);struct obd_device *obd = exp->exp_obd;
@@ -2489,7 +2490,7 @@ static int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp, }static int lmv_cancel_unused (struct obd_export *exp,const struct lu_fid *fid, -ldlm_policy_data_t *policy,ldlm_mode_t mode, +ldlm_policy_data_t *policy,enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque) {struct obd_device *obd = exp->exp_obd;
@@ -2523,14 +2524,16 @@ static int lmv_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,return rc; } -static ldlm_mode_t lmv_lock_match (struct obd_export *exp,__u64 flags, -const struct lu_fid *fid,ldlm_type_t type, -ldlm_policy_data_t *policy,ldlm_mode_t mode, -struct lustre_handle *lockh) +static enum ldlm_mode lmv_lock_match (struct obd_export *exp,__u64 flags, +const struct lu_fid *fid, +enum ldlm_type type, +ldlm_policy_data_t *policy, +enum ldlm_mode mode, +struct lustre_handle *lockh) {struct obd_device *obd = exp->exp_obd;struct lmv_obd *lmv = &obd->u.lmv; -ldlm_mode_t rc; +enum ldlm_mode rc;int i;CDEBUG (D_INODE ,"Lock match for " DFID "\n" ,PFID (fid));
drivers/staging/lustre/lustre/mdc/mdc_internal.h +6 -6
@@ -90,7 +90,7 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, struct ptlrpc_request **req, __u64 extra_lock_flags);int mdc_resource_get_unused (struct obd_export *exp,const struct lu_fid *fid, -struct list_head *cancels,ldlm_mode_t mode, +struct list_head *cancels,enum ldlm_mode mode,__u64 bits);/* mdc/mdc_request.c */ int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
@@ -119,7 +119,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,int mdc_unlink (struct obd_export *exp,struct md_op_data *op_data,struct ptlrpc_request **request);int mdc_cancel_unused (struct obd_export *exp,const struct lu_fid *fid, -ldlm_policy_data_t *policy,ldlm_mode_t mode, +ldlm_policy_data_t *policy,enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque); int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
@@ -129,10 +129,10 @@ int mdc_intent_getattr_async(struct obd_export *exp,struct md_enqueue_info *minfo, struct ldlm_enqueue_info *einfo); -ldlm_mode_t mdc_lock_match (struct obd_export *exp,__u64 flags, -const struct lu_fid *fid,ldlm_type_t type, -ldlm_policy_data_t *policy,ldlm_mode_t mode, -struct lustre_handle *lockh); +enum ldlm_mode mdc_lock_match (struct obd_export *exp,__u64 flags, +const struct lu_fid *fid,enum ldlm_type type, +ldlm_policy_data_t *policy,enum ldlm_mode mode, +struct lustre_handle *lockh); static inline int mdc_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req, int opc,
drivers/staging/lustre/lustre/mdc/mdc_locks.c +7 -7
@@ -151,13 +151,13 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,return 0 ; } -ldlm_mode_t mdc_lock_match (struct obd_export *exp,__u64 flags, -const struct lu_fid *fid,ldlm_type_t type, -ldlm_policy_data_t *policy,ldlm_mode_t mode, -struct lustre_handle *lockh) +enum ldlm_mode mdc_lock_match (struct obd_export *exp,__u64 flags, +const struct lu_fid *fid,enum ldlm_type type, +ldlm_policy_data_t *policy,enum ldlm_mode mode, +struct lustre_handle *lockh) {struct ldlm_res_id res_id; -ldlm_mode_t rc; +enum ldlm_mode rc;fid_build_reg_res_name (fid, &res_id);/* LU-4405: Clear bits not supported by server */
@@ -170,7 +170,7 @@ ldlm_mode_t mdc_lock_match(struct obd_export *exp, __u64 flags,int mdc_cancel_unused (struct obd_export *exp,const struct lu_fid *fid,ldlm_policy_data_t *policy, -ldlm_mode_t mode, +enum ldlm_mode mode,ldlm_cancel_flags_t flags,void *opaque) {
@@ -1036,7 +1036,7 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,struct ldlm_res_id res_id;struct lustre_handle lockh;ldlm_policy_data_t policy; -ldlm_mode_t mode; +enum ldlm_mode mode;if (it->d.lustre.it_lock_handle) { lockh.cookie = it->d.lustre.it_lock_handle;
drivers/staging/lustre/lustre/mdc/mdc_reint.c +1 -1
@@ -67,7 +67,7 @@ static int mdc_reint(struct ptlrpc_request *request,* found by @fid. Found locks are added into @cancel list. Returns the amount of * locks added to @cancels list. */ int mdc_resource_get_unused (struct obd_export *exp,const struct lu_fid *fid, -struct list_head *cancels,ldlm_mode_t mode, +struct list_head *cancels,enum ldlm_mode mode,__u64 bits) {struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
drivers/staging/lustre/lustre/osc/osc_cl_internal.h +2 -2
@@ -522,7 +522,7 @@ static inline struct cl_object *osc2cl(const struct osc_object *obj)return (struct cl_object *)&obj->oo_cl; } -static inline ldlm_mode_t osc_cl_lock2ldlm (enum cl_lock_mode mode) +static inline enum ldlm_mode osc_cl_lock2ldlm (enum cl_lock_mode mode) {LASSERT (mode ==CLM_READ || mode ==CLM_WRITE || mode ==CLM_GROUP );if (mode ==CLM_READ )
@@ -533,7 +533,7 @@ static inline ldlm_mode_t osc_cl_lock2ldlm(enum cl_lock_mode mode)return LCK_GROUP ; } -static inline enum cl_lock_mode osc_ldlm2cl_lock (ldlm_mode_t mode) +static inline enum cl_lock_mode osc_ldlm2cl_lock (enum ldlm_mode mode) {LASSERT (mode ==LCK_PR || mode ==LCK_PW || mode ==LCK_GROUP );if (mode ==LCK_PR )
drivers/staging/lustre/lustre/osc/osc_request.c +4 -4
@@ -631,7 +631,7 @@ int osc_sync_base(struct obd_export *exp, struct obd_info *oinfo,* locks added to @cancels list. */ static int osc_resource_get_unused (struct obd_export *exp,struct obdo *oa,struct list_head *cancels, -ldlm_mode_t mode,__u64 lock_flags) +enum ldlm_mode mode,__u64 lock_flags) {struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;struct ldlm_res_id res_id;
@@ -2195,7 +2195,7 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,struct ptlrpc_request *req =NULL ;int intent = *flags &LDLM_FL_HAS_INTENT ;__u64 match_lvb = (agl !=0 ?0 :LDLM_FL_LVB_READY ); -ldlm_mode_t mode; +enum ldlm_mode mode;int rc;/* Filesystem lock extents are extended to page boundaries so that
@@ -2338,7 +2338,7 @@ int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, {struct obd_device *obd = exp->exp_obd;__u64 lflags = *flags; -ldlm_mode_t rc; +enum ldlm_mode rc;if (OBD_FAIL_CHECK (OBD_FAIL_OSC_MATCH ))return -EIO ;
@@ -2733,7 +2733,7 @@ out:struct ldlm_res_id res_id;ldlm_policy_data_t policy;struct lustre_handle lockh; -ldlm_mode_t mode =0 ; +enum ldlm_mode mode =0 ;struct ptlrpc_request *req;struct ll_user_fiemap *reply;char *tmp;
Signature · 1 line
2.1.0
kbuild test robot
build botRe: [PATCH 10/56] staging/lustre: Remove ldlm type/mode typedefs
reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree…
Hi Oleg,
[auto build test ERROR on staging/staging-testing]
[also build test ERROR on v4.5-rc5 next-20160222]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/green-linuxhacker-ru/More-Lustre-cleanups/20160223-120654 config: sparc64-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=sparc64
Note: the linux-review/green-linuxhacker-ru/More-Lustre-cleanups/20160223-120654 HEAD 340181b90a18083de9509c39311e6e7859b89274 builds fine.
It only hurts bisectibility.
All errors (new ones prefixed by >>):
In file included from drivers/staging/lustre/lustre/fid/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/fid/../include/obd.h:54, from drivers/staging/lustre/lustre/fid/fid_request.c:48:
>> drivers/staging/lustre/lustre/fid/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/fld/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/fld/../include/obd.h:54, from drivers/staging/lustre/lustre/fld/fld_request.c:49:
>> drivers/staging/lustre/lustre/fld/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^
--
In file included from drivers/staging/lustre/lustre/llite/../include/linux/../lustre_export.h:51:0,
from drivers/staging/lustre/lustre/llite/../include/linux/../obd.h:54,
from drivers/staging/lustre/lustre/llite/../include/linux/../obd_class.h:42,
from drivers/staging/lustre/lustre/llite/../include/linux/lustre_lite.h:47,
from drivers/staging/lustre/lustre/llite/../include/lustre_lite.h:45,
from drivers/staging/lustre/lustre/llite/dcache.c:44:
>> drivers/staging/lustre/lustre/llite/../include/linux/../lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/llite/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/llite/../include/obd.h:54, from drivers/staging/lustre/lustre/llite/../include/obd_class.h:42, from drivers/staging/lustre/lustre/llite/dir.c:52:
>> drivers/staging/lustre/lustre/llite/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/lmv/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/lmv/../include/obd.h:54, from drivers/staging/lustre/lustre/lmv/../include/obd_class.h:42, from drivers/staging/lustre/lustre/lmv/lmv_obd.c:52:
>> drivers/staging/lustre/lustre/lmv/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^
--
In file included from drivers/staging/lustre/lustre/lov/lov_obd.c:51:0:
>> drivers/staging/lustre/lustre/lov/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/mdc/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/mdc/../include/obd.h:54, from drivers/staging/lustre/lustre/mdc/../include/obd_class.h:42, from drivers/staging/lustre/lustre/mdc/mdc_request.c:46:
>> drivers/staging/lustre/lustre/mdc/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/mgc/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/mgc/../include/obd.h:54, from drivers/staging/lustre/lustre/mgc/../include/obd_class.h:42, from drivers/staging/lustre/lustre/mgc/mgc_request.c:45:
>> drivers/staging/lustre/lustre/mgc/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/obdclass/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/obdclass/../include/obd.h:54, from drivers/staging/lustre/lustre/obdclass/../include/obd_class.h:42, from drivers/staging/lustre/lustre/obdclass/llog.c:50:
>> drivers/staging/lustre/lustre/obdclass/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^--
In file included from drivers/staging/lustre/lustre/obdecho/../include/lustre_export.h:51:0,
from drivers/staging/lustre/lustre/obdecho/../include/obd.h:54, from drivers/staging/lustre/lustre/obdecho/echo_client.c:40:
>> drivers/staging/lustre/lustre/obdecho/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^
--
In file included from drivers/staging/lustre/lustre/osc/osc_request.c:41:0:
>> drivers/staging/lustre/lustre/osc/../include/lustre_dlm.h:852:2: error: unknown type name 'ldlm_mode_t'
ldlm_mode_t lr_most_restr;
^..
vim +/ldlm_mode_t +852 drivers/staging/lustre/lustre/fid/../include/lustre_dlm.h
d7e09d039 Peng Tao 2013-05-02 846 * List of locks that could not be granted due to conflicts and d7e09d039 Peng Tao 2013-05-02 847 * that are waiting for conflicts to go away */ d7e09d039 Peng Tao 2013-05-02 848 struct list_head lr_waiting; d7e09d039 Peng Tao 2013-05-02 849 /** @} */ d7e09d039 Peng Tao 2013-05-02 850 d7e09d039 Peng Tao 2013-05-02 851 /* XXX No longer needed? Remove ASAP */ d7e09d039 Peng Tao 2013-05-02 @852 ldlm_mode_t lr_most_restr; d7e09d039 Peng Tao 2013-05-02 853 d7e09d039 Peng Tao 2013-05-02 854 /** Type of locks this resource can hold. Only one type per resource. */
795336151 Oleg Drokin 2016-02-22 855 enum ldlm_type lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
:::::: The code at line 852 was first introduced by commit
:::::: d7e09d0397e84eefbabfd9cb353221f3c6448d83 staging: add Lustre file system client support
:::::: TO: Peng Tao <[email protected]>
:::::: CC: Greg Kroah-Hartman <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/octet-stream
Size: 45195 bytes
Desc: not available
URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20160223/999baf4c/attachment-0001.obj>
PATCH 11/56 staging/lustre: Get rid of mgs_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum mgs_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2820,7 +2820,7 @@ void lustre_swab_ldlm_reply(struct ldlm_reply *r);/* * Opcodes for mountconf (mgs and mgc) */ -typedef enum { +enum mgs_cmd {MGS_CONNECT =250 ,MGS_DISCONNECT ,MGS_EXCEPTION ,/* node died, etc. */
@@ -2829,7 +2829,7 @@ typedef enum {MGS_SET_INFO ,MGS_CONFIG_READ , MGS_LAST_OPC -} mgs_cmd_t; +};#define MGS_FIRST_OPC MGS_CONNECT#define MGS_PARAM_MAXLEN 1024
Signature · 1 line
2.1.0
PATCH 12/56 staging/lustre: Get rid of obd_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace with enum obd_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2918,13 +2918,13 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size);* Opcodes for multiple servers. */ -typedef enum { +enum obd_cmd {OBD_PING =400 ,OBD_LOG_CANCEL ,OBD_QC_CALLBACK ,OBD_IDX_READ ,OBD_LAST_OPC -}obd_cmd_t ; +};#define OBD_FIRST_OPC OBD_PING/* catalog of log objects */
Signature · 1 line
2.1.0
PATCH 13/56 staging/lustre: Get rid of llog_op_type typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace with enum llog_op_type
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -2950,7 +2950,7 @@ struct llog_catid {#define LLOG_OP_MAGIC 0x10600000#define LLOG_OP_MASK 0xfff00000 -typedef enum { +enum llog_op_type {LLOG_PAD_MAGIC =LLOG_OP_MAGIC |0x00000 ,OST_SZ_REC =LLOG_OP_MAGIC |0x00f00 ,/* OST_RAID1_REC = LLOG_OP_MAGIC | 0x01000, never used */
@@ -2970,7 +2970,7 @@ typedef enum {HSM_AGENT_REC =LLOG_OP_MAGIC |0x80000 ,LLOG_HDR_MAGIC =LLOG_OP_MAGIC |0x45539 , LLOG_LOGID_MAGIC = LLOG_OP_MAGIC | 0x4553b, -} llog_op_type; +};#define LLOG_REC_HDR_NEEDS_SWABBING (r) \ (((r)->lrh_type & __swab32(LLOG_OP_MASK)) == __swab32(LLOG_OP_MAGIC))
Signature · 1 line
2.1.0
PATCH 14/56 staging/lustre: Get rid of sec_cmd_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace with enum sec_cmd
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2
@@ -3436,13 +3436,13 @@ union lu_page { };/* security opcodes */ -typedef enum { +enum sec_cmd {SEC_CTX_INIT =801 ,SEC_CTX_INIT_CONT =802 ,SEC_CTX_FINI =803 ,SEC_LAST_OPC ,SEC_FIRST_OPC =SEC_CTX_INIT -}sec_cmd_t ; +};/* * capa related definitions
Signature · 1 line
2.1.0
PATCH 15/56 staging/lustre/ldlm: Remove unused lr_most_restr from struct ldlm_resource
In reply to [email protected]From: Oleg Drokin <[email protected]>
This member comes from the dawn of time and is no longer needed
--- drivers/staging/lustre/lustre/include/lustre_dlm.h | 3 --- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 3 --- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 - 3 files changed, 7 deletions(-)
drivers/staging/lustre/lustre/include/lustre_dlm.h +0 -3
@@ -848,9 +848,6 @@ struct ldlm_resource {struct list_head lr_waiting;/** @} */ -/* XXX No longer needed? Remove ASAP */ -ldlm_mode_t lr_most_restr; -/** Type of locks this resource can hold. Only one type per resource. */ enum ldlm_type lr_type;/* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +0 -3
@@ -1033,9 +1033,6 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)else ldlm_resource_add_lock (res, &res->lr_granted, lock); -if (lock->l_granted_mode < res->lr_most_restr) - res->lr_most_restr = lock->l_granted_mode; -if (work_list && lock->l_completion_ast)ldlm_add_ast_work_item (lock,NULL , work_list);
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +0 -1
@@ -1111,7 +1111,6 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, res->lr_ns_bucket =cfs_hash_bd_extra_get (ns->ns_rs_hash, &bd); res->lr_name = *name; res->lr_type = type; - res->lr_most_restr =LCK_NL ;cfs_hash_bd_lock (ns->ns_rs_hash, &bd,1 ); hnode = (version == cfs_hash_bd_version_get(&bd)) ? NULL :
Signature · 1 line
2.1.0
PATCH 16/56 staging/lustre: Get rid of object update code
In reply to [email protected]From: Oleg Drokin <[email protected]>
Object update was originally planned to be used for cross-server updates, so nothing to do with the client. The idea was later significantly reworked anyway so even wire structs should not be retained.
This gets rid of update_cmd_t, UPDATE and UPDATE_REPLY rpc and corresponding subcommands, swabbing logic and such.
--- .../staging/lustre/lustre/include/lprocfs_status.h | 16 +--- .../lustre/lustre/include/lustre/lustre_idl.h | 94 ---------------------- .../lustre/lustre/include/lustre_req_layout.h | 4 - drivers/staging/lustre/lustre/ptlrpc/layout.c | 25 ------ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 1 - .../staging/lustre/lustre/ptlrpc/pack_generic.c | 18 ----- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 84 ------------------- 7 files changed, 1 insertion(+), 241 deletions(-)
drivers/staging/lustre/lustre/include/lprocfs_status.h +1 -15
@@ -284,19 +284,6 @@ static inline int opcode_offset(__u32 opc)OPC_RANGE (LDLM ) +OPC_RANGE (MDS ) + OPC_RANGE(OST)); - }else if (opc <UPDATE_LAST_OPC ) { -/* update opcode */ -return (opc -UPDATE_FIRST_OPC + -OPC_RANGE (FLD ) + -OPC_RANGE (SEC ) + -OPC_RANGE (SEQ ) + -OPC_RANGE (QUOTA ) + -OPC_RANGE (LLOG ) + -OPC_RANGE (OBD ) + -OPC_RANGE (MGS ) + -OPC_RANGE (LDLM ) + -OPC_RANGE (MDS ) + -OPC_RANGE (OST )); }else {/* Unknown Opcode */ return -1 ;
@@ -312,8 +299,7 @@ static inline int opcode_offset(__u32 opc) OPC_RANGE(SEC) + \ OPC_RANGE(SEQ) + \ OPC_RANGE(SEC) + \ -OPC_RANGE (FLD ) + \ - OPC_RANGE(UPDATE)) + OPC_RANGE(FLD))#define EXTRA_MAX_OPCODES ((PTLRPC_LAST_CNTR - PTLRPC_FIRST_CNTR) + \ OPC_RANGE(EXTRA))
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -94
106 lines not on this page · raw message
drivers/staging/lustre/lustre/include/lustre_req_layout.h +0 -4
@@ -146,7 +146,6 @@ extern struct req_format RQF_MDS_GETSTATUS;extern struct req_format RQF_MDS_SYNC ;extern struct req_format RQF_MDS_GETXATTR ;extern struct req_format RQF_MDS_GETATTR ; -extern struct req_format RQF_UPDATE_OBJ ;/* * This is format of direct (non-intent) MDS_GETATTR_NAME request.
@@ -322,9 +321,6 @@ extern struct req_msg_field RMF_MGS_CONFIG_RES;/* generic uint32 */ extern struct req_msg_field RMF_U32 ; -/* OBJ update format */ -extern struct req_msg_field RMF_UPDATE ; -extern struct req_msg_field RMF_UPDATE_REPLY ;/** @} req_layout */ #endif /* _LUSTRE_REQ_LAYOUT_H__ */
drivers/staging/lustre/lustre/ptlrpc/layout.c +0 -25
@@ -514,16 +514,6 @@ static const struct req_msg_field *mds_setattr_server[] = { &RMF_CAPA2 }; -static const struct req_msg_field *mds_update_client[] = { - &RMF_PTLRPC_BODY , - &RMF_UPDATE , -}; - -static const struct req_msg_field *mds_update_server[] = { - &RMF_PTLRPC_BODY , - &RMF_UPDATE_REPLY , -}; -static const struct req_msg_field *llog_origin_handle_create_client[] = { &RMF_PTLRPC_BODY , &RMF_LLOGD_BODY ,
@@ -721,7 +711,6 @@ static struct req_format *req_formats[] = { &RQF_MDS_HSM_ACTION , &RQF_MDS_HSM_REQUEST , &RQF_MDS_SWAP_LAYOUTS , - &RQF_UPDATE_OBJ , &RQF_QC_CALLBACK , &RQF_OST_CONNECT , &RQF_OST_DISCONNECT,
@@ -1145,15 +1134,6 @@ struct req_msg_field RMF_MDS_HSM_REQUEST = lustre_swab_hsm_request, NULL);EXPORT_SYMBOL (RMF_MDS_HSM_REQUEST ); -struct req_msg_field RMF_UPDATE =DEFINE_MSGF ("update" ,0 ,-1 , - lustre_swab_update_buf,NULL ); -EXPORT_SYMBOL (RMF_UPDATE ); - -struct req_msg_field RMF_UPDATE_REPLY =DEFINE_MSGF ("update_reply" ,0 ,-1 , - lustre_swab_update_reply_buf, -NULL ); -EXPORT_SYMBOL (RMF_UPDATE_REPLY ); -struct req_msg_field RMF_SWAP_LAYOUTS =DEFINE_MSGF ("swap_layouts" ,0 ,sizeof (struct mdc_swap_layouts ), lustre_swab_swap_layouts,NULL );
@@ -1357,11 +1337,6 @@ struct req_format RQF_MDS_GET_INFO = mds_getinfo_server);EXPORT_SYMBOL (RQF_MDS_GET_INFO ); -struct req_format RQF_UPDATE_OBJ = -DEFINE_REQ_FMT0 ("OBJECT_UPDATE_OBJ" , mds_update_client, - mds_update_server); -EXPORT_SYMBOL (RQF_UPDATE_OBJ ); -struct req_format RQF_LDLM_ENQUEUE =DEFINE_REQ_FMT0 ("LDLM_ENQUEUE" , ldlm_enqueue_client, ldlm_enqueue_lvb_server);
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +0 -1
@@ -131,7 +131,6 @@ static struct ll_rpc_opcode { { SEC_CTX_INIT_CONT, "sec_ctx_init_cont" }, { SEC_CTX_FINI, "sec_ctx_fini" }, { FLD_QUERY, "fld_query" }, - { UPDATE_OBJ, "update_obj" }, }; static struct ll_eopcode {
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +0 -18
@@ -2286,24 +2286,6 @@ void lustre_swab_hsm_request(struct hsm_request *hr) }EXPORT_SYMBOL (lustre_swab_hsm_request); -void lustre_swab_update_buf (struct update_buf *ub) -{ -__swab32s (&ub->ub_magic); -__swab32s (&ub->ub_count); -} -EXPORT_SYMBOL (lustre_swab_update_buf); - -void lustre_swab_update_reply_buf (struct update_reply *ur) -{ -int i; - -__swab32s (&ur->ur_version); -__swab32s (&ur->ur_count); -for (i =0 ; i < ur->ur_count; i++) -__swab32s (&ur->ur_lens[i]); -} -EXPORT_SYMBOL (lustre_swab_update_reply_buf); -void lustre_swab_swap_layouts (struct mdc_swap_layouts *msl) {__swab64s (&msl->msl_flags);
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -84
100 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 17/56 staging/lustre: Get rid of lustre_fid typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with struct lu_fid
--- .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- .../lustre/lustre/include/lustre/lustre_user.h | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +1 -1
@@ -3550,7 +3550,7 @@ void lustre_swab_layout_intent(struct layout_intent *li);*/ struct hsm_progress_kernel {/* Field taken from struct hsm_progress */ -lustre_fid hpk_fid; +struct lu_fid hpk_fid;__u64 hpk_cookie;struct hsm_extent hpk_extent;__u16 hpk_flags;
drivers/staging/lustre/lustre/include/lustre/lustre_user.h +12 -12
@@ -136,7 +136,7 @@ struct filter_fid_old {/* Userspace should treat lu_fid as opaque, and only use the following methods * to print or parse them. Other functions (e.g. compare, swab) could be moved * here from lustre_idl.h if needed. */ -typedef struct lu_fid lustre_fid ; +struct lu_fid ;/** * Following struct for object attributes, that will be kept inode's EA.
@@ -761,10 +761,10 @@ struct changelog_rec {__u64 cr_prev;/**< last index for this target fid */ __u64 cr_time;union { -lustre_fid cr_tfid;/**< target fid */ +struct lu_fid cr_tfid;/**< target fid */ __u32 cr_markerflags;/**< CL_MARK flags */ }; -lustre_fid cr_pfid;/**< parent fid */ +struct lu_fid cr_pfid;/**< parent fid */ char cr_name[0 ];/**< last element */ } __packed;
@@ -781,12 +781,12 @@ struct changelog_ext_rec {__u64 cr_prev;/**< last index for this target fid */ __u64 cr_time;union { -lustre_fid cr_tfid;/**< target fid */ +struct lu_fid cr_tfid;/**< target fid */ __u32 cr_markerflags;/**< CL_MARK flags */ }; -lustre_fid cr_pfid;/**< target parent fid */ -lustre_fid cr_sfid;/**< source fid, or zero */ -lustre_fid cr_spfid;/**< source parent fid, or zero */ +struct lu_fid cr_pfid;/**< target parent fid */ +struct lu_fid cr_sfid;/**< source fid, or zero */ +struct lu_fid cr_spfid;/**< source parent fid, or zero */ char cr_name[0 ];/**< last element */ } __packed;
@@ -976,8 +976,8 @@ struct hsm_request { };struct hsm_user_item { -lustre_fid hui_fid; -struct hsm_extent hui_extent; +struct lu_fid hui_fid; +struct hsm_extent hui_extent; } __packed;struct hsm_user_request {
@@ -1046,8 +1046,8 @@ static inline char *hsm_copytool_action2name(enum hsm_copytool_action a)struct hsm_action_item {__u32 hai_len;/* valid size of this struct */ __u32 hai_action;/* hsm_copytool_action, but use known size */ -lustre_fid hai_fid;/* Lustre FID to operated on */ -lustre_fid hai_dfid;/* fid used for data access */ +struct lu_fid hai_fid;/* Lustre FID to operated on */ +struct lu_fid hai_dfid;/* fid used for data access */ struct hsm_extent hai_extent;/* byte range to operate on */ __u64 hai_cookie;/* action cookie from coordinator */ __u64 hai_gid;/* grouplock id */
@@ -1157,7 +1157,7 @@ struct hsm_user_import {#define HP_FLAG_RETRY 0x02struct hsm_progress { -lustre_fid hp_fid; +struct lu_fid hp_fid;__u64 hp_cookie;struct hsm_extent hp_extent;__u16 hp_flags;
Signature · 1 line
2.1.0
PATCH 18/56 staging/lustre: Get rid of lustre_quota_version typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Does not appear to be used anywhere.
--- drivers/staging/lustre/lustre/include/lustre/lustre_user.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_user.h +2 -2
@@ -566,9 +566,9 @@ enum {/* hdr + MDT index */ #define LUSTRE_VOLATILE_IDX LUSTRE_VOLATILE_HDR":%.4X:" -typedef enum lustre_quota_version { +enum lustre_quota_version {LUSTRE_QUOTA_V2 =1 -}lustre_quota_version_t ; +};/* XXX: same as if_dqinfo struct in kernel */ struct obd_dqinfo {
Signature · 1 line
2.1.0
PATCH 19/56 staging/lustre: Get rid of ldlm_error_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ldlm_error
--- drivers/staging/lustre/lustre/include/lustre_dlm.h | 8 ++++---- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 4 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 4 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/lustre/lustre/include/lustre_dlm.h +4 -4
@@ -69,7 +69,7 @@ struct obd_device;/** * LDLM non-error return states */ -typedef enum { +enum ldlm_error {ELDLM_OK =0 ,ELDLM_LOCK_CHANGED =300 ,
@@ -80,7 +80,7 @@ typedef enum {ELDLM_NAMESPACE_EXISTS =400 , ELDLM_BAD_NAMESPACE = 401 -} ldlm_error_t; +};/** * LDLM namespace type.
@@ -1019,7 +1019,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, }while (0 ) typedef int (*ldlm_processing_policy)(struct ldlm_lock *lock, __u64 *flags, -int first_enq,ldlm_error_t *err, +int first_enq,enum ldlm_error *err,struct list_head *work_list);/**
@@ -1105,7 +1105,7 @@ static inline int ldlm_res_lvbo_update(struct ldlm_resource *res,return 0 ; } -int ldlm_error2errno (ldlm_error_t error); +int ldlm_error2errno (enum ldlm_error error);#if LUSTRE_TRACKS_LOCK_EXP_REFS void ldlm_dump_export_locks (struct obd_export *exp);
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +2 -2
@@ -133,7 +133,7 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode, __u64 flags)* would be collected and ASTs sent. */ static int ldlm_process_flock_lock (struct ldlm_lock *req,__u64 *flags, -int first_enq,ldlm_error_t *err, +int first_enq,enum ldlm_error *err,struct list_head *work_list) {struct ldlm_resource *res = req->l_resource;
@@ -449,7 +449,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)struct obd_import *imp =NULL ;struct ldlm_flock_wait_data fwd;struct l_wait_info lwi; -ldlm_error_t err; +enum ldlm_error err;int rc =0 ; CDEBUG(D_DLMTRACE, "flags: 0x%llx data: %p getlk: %p\n",
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +2 -2
@@ -136,8 +136,8 @@ ldlm_lock_create(struct ldlm_namespace *ns, const struct ldlm_res_id *, enum ldlm_type type, enum ldlm_mode mode, const struct ldlm_callback_suite *cbs, void *data, __u32 lvb_len, enum lvb_type lvb_type); -ldlm_error_t ldlm_lock_enqueue (struct ldlm_namespace *,struct ldlm_lock **, -void *cookie,__u64 *flags); +enum ldlm_error ldlm_lock_enqueue (struct ldlm_namespace *,struct ldlm_lock **, +void *cookie,__u64 *flags);void ldlm_lock_addref_internal (struct ldlm_lock *,__u32 mode);void ldlm_lock_addref_internal_nolock (struct ldlm_lock *,__u32 mode);void ldlm_lock_decref_internal (struct ldlm_lock *,__u32 mode);
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +2 -2
@@ -733,7 +733,7 @@ enum ldlm_mode lck_compat_array[] = {* Rather arbitrary mapping from LDLM error codes to errno values. This should * not escape to the user level. */ -int ldlm_error2errno (ldlm_error_t error) +int ldlm_error2errno (enum ldlm_error error) {int result;
@@ -761,7 +761,7 @@ int ldlm_error2errno(ldlm_error_t error)break ;default :if (((int )error) <0 )/* cast to signed type */ - result = error;/* as ldlm_error_t can be unsigned */ + result = error;/* as enum ldlm_error can be unsigned */ else {CERROR ("Invalid DLM result code: %d\n" , error); result = -EPROTO ;
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +3 -3
@@ -1512,9 +1512,9 @@ out:* Does not block. As a result of enqueue the lock would be put * into granted or waiting list. */ -ldlm_error_t ldlm_lock_enqueue (struct ldlm_namespace *ns, -struct ldlm_lock **lockp, -void *cookie,__u64 *flags) +enum ldlm_error ldlm_lock_enqueue (struct ldlm_namespace *ns, +struct ldlm_lock **lockp, +void *cookie,__u64 *flags) {struct ldlm_lock *lock = *lockp;struct ldlm_resource *res = lock->l_resource;
Signature · 1 line
2.1.0
PATCH 20/56 staging/lustre: Remove ldlm_appetite_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ldlm_appetite
--- drivers/staging/lustre/lustre/include/lustre_dlm.h | 8 ++++---- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/lustre/lustre/include/lustre_dlm.h +4 -4
@@ -296,10 +296,10 @@ struct ldlm_valblock_ops {* LDLM pools related, type of lock pool in the namespace. * Greedy means release cached locks aggressively */ -typedef enum { +enum ldlm_appetite {LDLM_NAMESPACE_GREEDY =1 <<0 ,LDLM_NAMESPACE_MODEST =1 <<1 -}ldlm_appetite_t ; +};struct ldlm_ns_bucket {/** back pointer to namespace */
@@ -440,7 +440,7 @@ struct ldlm_namespace {/** LDLM pool structure for this namespace */ struct ldlm_pool ns_pool;/** Definition of how eagerly unused locks will be released from LRU */ -ldlm_appetite_t ns_appetite; +enum ldlm_appetite ns_appetite;/** Limit of parallel AST RPC count. */ unsigned ns_max_parallel_ast;
@@ -1176,7 +1176,7 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);/* resource.c */ struct ldlm_namespace *ldlm_namespace_new (struct obd_device *obd,char *name, -ldlm_side_t client,ldlm_appetite_t apt, +ldlm_side_t client,enum ldlm_appetite apt,ldlm_ns_type_t ns_type);int ldlm_namespace_cleanup (struct ldlm_namespace *ns,__u64 flags);void ldlm_namespace_get (struct ldlm_namespace *ns);
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +1 -1
@@ -621,7 +621,7 @@ static void ldlm_namespace_register(struct ldlm_namespace *ns,*/ struct ldlm_namespace *ldlm_namespace_new (struct obd_device *obd,char *name,ldlm_side_t client, -ldlm_appetite_t apt, +enum ldlm_appetite apt,ldlm_ns_type_t ns_type) {struct ldlm_namespace *ns =NULL ;
Signature · 1 line
2.1.0
PATCH 21/56 staging/lustre: Get rid of ldlm_ns_type_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ldlm_ns_type
--- drivers/staging/lustre/lustre/include/lustre_dlm.h | 6 +++--- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/lustre/lustre/include/lustre_dlm.h +3 -3
@@ -318,7 +318,7 @@ enum {LDLM_NSS_LAST }; -typedef enum { +enum ldlm_ns_type {/** invalid type */ LDLM_NS_TYPE_UNKNOWN =0 ,/** mdc namespace */
@@ -333,7 +333,7 @@ typedef enum {LDLM_NS_TYPE_MGC ,/** mgs namespace */ LDLM_NS_TYPE_MGT, -} ldlm_ns_type_t; +};/** * LDLM Namespace.
@@ -1177,7 +1177,7 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);struct ldlm_namespace *ldlm_namespace_new (struct obd_device *obd,char *name,ldlm_side_t client,enum ldlm_appetite apt, -ldlm_ns_type_t ns_type); +enum ldlm_ns_type ns_type);int ldlm_namespace_cleanup (struct ldlm_namespace *ns,__u64 flags);void ldlm_namespace_get (struct ldlm_namespace *ns);void ldlm_namespace_put (struct ldlm_namespace *ns);
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +1 -1
@@ -241,7 +241,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)struct obd_uuid server_uuid;int rq_portal, rp_portal, connect_op;char *name = obddev->obd_type->typ_name; -ldlm_ns_type_t ns_type =LDLM_NS_TYPE_UNKNOWN ; +enum ldlm_ns_type ns_type =LDLM_NS_TYPE_UNKNOWN ;int rc;/* In a more perfect world, we would hang a ptlrpc_client off of
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +2 -2
@@ -554,7 +554,7 @@ static struct cfs_hash_ops ldlm_ns_fid_hash_ops = { };struct ldlm_ns_hash_def { -ldlm_ns_type_t nsd_type; +enum ldlm_ns_type nsd_type;/** hash bucket bits */ unsigned nsd_bkt_bits;/** hash bits */
@@ -622,7 +622,7 @@ static void ldlm_namespace_register(struct ldlm_namespace *ns,struct ldlm_namespace *ldlm_namespace_new (struct obd_device *obd,char *name,ldlm_side_t client,enum ldlm_appetite apt, -ldlm_ns_type_t ns_type) +enum ldlm_ns_type ns_type) {struct ldlm_namespace *ns =NULL ;struct ldlm_ns_bucket *nsb;
Signature · 1 line
2.1.0
PATCH 22/56 staging/lustre: Get rid of ldlm_cancel_flags_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum ldlm_cancel_flags
--- drivers/staging/lustre/lustre/include/lustre_dlm.h | 18 ++++++++++-------- drivers/staging/lustre/lustre/include/obd.h | 2 +- drivers/staging/lustre/lustre/include/obd_class.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 6 +++--- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 10 +++++----- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 20 +++++++++++--------- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_internal.h | 2 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- 9 files changed, 34 insertions(+), 30 deletions(-)
drivers/staging/lustre/lustre/include/lustre_dlm.h +10 -8
@@ -533,12 +533,12 @@ struct ldlm_interval_tree {#define LUSTRE_TRACKS_LOCK_EXP_REFS (0)/** Cancel flags. */ -typedef enum { +enum ldlm_cancel_flags {LCF_ASYNC =0x1 ,/* Cancel locks asynchronously. */ LCF_LOCAL =0x2 ,/* Cancel locks locally, not notifing server */ LCF_BL_AST =0x4 ,/* Cancel locks marked as LDLM_FL_BL_AST * in the same RPC */ -}ldlm_cancel_flags_t ; +};struct ldlm_flock {__u64 start;
@@ -1245,24 +1245,26 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, struct lustre_handle *lockh, int rc);int ldlm_cli_update_pool (struct ptlrpc_request *req);int ldlm_cli_cancel (struct lustre_handle *lockh, -ldlm_cancel_flags_t cancel_flags); +enum ldlm_cancel_flags cancel_flags);int ldlm_cli_cancel_unused (struct ldlm_namespace *,const struct ldlm_res_id *, -ldlm_cancel_flags_t flags,void *opaque); +enum ldlm_cancel_flags flags,void *opaque);int ldlm_cli_cancel_unused_resource (struct ldlm_namespace *ns,const struct ldlm_res_id *res_id,ldlm_policy_data_t *policy,enum ldlm_mode mode, -ldlm_cancel_flags_t flags, +enum ldlm_cancel_flags flags,void *opaque);int ldlm_cancel_resource_local (struct ldlm_resource *res,struct list_head *cancels,ldlm_policy_data_t *policy,enum ldlm_mode mode,__u64 lock_flags, -ldlm_cancel_flags_t cancel_flags,void *opaque); +enum ldlm_cancel_flags cancel_flags, +void *opaque);int ldlm_cli_cancel_list_local (struct list_head *cancels,int count, -ldlm_cancel_flags_t flags); +enum ldlm_cancel_flags flags);int ldlm_cli_cancel_list (struct list_head *head,int count, -struct ptlrpc_request *req,ldlm_cancel_flags_t flags); +struct ptlrpc_request *req, +enum ldlm_cancel_flags flags);/** @} ldlm_cli_api */ /* mds/handler.c */
drivers/staging/lustre/lustre/include/obd.h +1 -1
@@ -1167,7 +1167,7 @@ struct md_ops {int (*cancel_unused)(struct obd_export *,const struct lu_fid *,ldlm_policy_data_t *,enum ldlm_mode , -ldlm_cancel_flags_t flags,void *opaque); +enum ldlm_cancel_flags flags,void *opaque);int (*get_remote_perm)(struct obd_export *,const struct lu_fid *,__u32 ,struct ptlrpc_request **);
drivers/staging/lustre/lustre/include/obd_class.h +1 -1
@@ -1657,7 +1657,7 @@ static inline int md_cancel_unused(struct obd_export *exp,const struct lu_fid *fid, ldlm_policy_data_t *policy, enum ldlm_mode mode, - ldlm_cancel_flags_t flags, + enum ldlm_cancel_flags flags, void *opaque) { int rc;
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +3 -3
@@ -100,10 +100,10 @@ enum { };int ldlm_cancel_lru (struct ldlm_namespace *ns,int nr, -ldlm_cancel_flags_t sync,int flags); +enum ldlm_cancel_flags sync,int flags);int ldlm_cancel_lru_local (struct ldlm_namespace *ns,struct list_head *cancels,int count,int max, -ldlm_cancel_flags_t cancel_flags,int flags); +enum ldlm_cancel_flags cancel_flags,int flags);extern int ldlm_enqueue_min;/* ldlm_resource.c */
@@ -154,7 +154,7 @@ int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,int ldlm_bl_to_thread_list (struct ldlm_namespace *ns,struct ldlm_lock_desc *ld,struct list_head *cancels,int count, -ldlm_cancel_flags_t cancel_flags); +enum ldlm_cancel_flags cancel_flags);void ldlm_handle_bl_callback (struct ldlm_namespace *ns,struct ldlm_lock_desc *ld,struct ldlm_lock *lock);
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +5 -5
@@ -107,7 +107,7 @@ struct ldlm_bl_work_item {struct list_head blwi_head;int blwi_count;struct completion blwi_comp; -ldlm_cancel_flags_t blwi_flags; +enum ldlm_cancel_flags blwi_flags;int blwi_mem_pressure; };
@@ -353,7 +353,7 @@ static int ldlm_callback_reply(struct ptlrpc_request *req, int rc) }static int __ldlm_bl_to_thread (struct ldlm_bl_work_item *blwi, -ldlm_cancel_flags_t cancel_flags) +enum ldlm_cancel_flags cancel_flags) {struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;
@@ -383,7 +383,7 @@ static inline void init_blwi(struct ldlm_bl_work_item *blwi,struct ldlm_lock_desc *ld, struct list_head *cancels, int count, struct ldlm_lock *lock, - ldlm_cancel_flags_t cancel_flags) + enum ldlm_cancel_flags cancel_flags) { init_completion(&blwi->blwi_comp);INIT_LIST_HEAD (&blwi->blwi_head);
@@ -417,7 +417,7 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, struct ldlm_lock *lock, struct list_head *cancels, int count, - ldlm_cancel_flags_t cancel_flags) + enum ldlm_cancel_flags cancel_flags) { if (cancels && count == 0) return 0;
@@ -451,7 +451,7 @@ int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,int ldlm_bl_to_thread_list (struct ldlm_namespace *ns,struct ldlm_lock_desc *ld,struct list_head *cancels,int count, -ldlm_cancel_flags_t cancel_flags) +enum ldlm_cancel_flags cancel_flags) {return ldlm_bl_to_thread (ns, ld,NULL , cancels, count, cancel_flags); }
drivers/staging/lustre/lustre/ldlm/ldlm_request.c +11 -9
@@ -860,7 +860,7 @@ static void ldlm_cancel_pack(struct ptlrpc_request *req,* handles of locks given in \a cancels list. */ static int ldlm_cli_cancel_req (struct obd_export *exp,struct list_head *cancels, -int count,ldlm_cancel_flags_t flags) +int count,enum ldlm_cancel_flags flags) {struct ptlrpc_request *req =NULL ;struct obd_import *imp;
@@ -1003,7 +1003,7 @@ EXPORT_SYMBOL(ldlm_cli_update_pool);* Lock must not have any readers or writers by this time. */ int ldlm_cli_cancel (struct lustre_handle *lockh, -ldlm_cancel_flags_t cancel_flags) +enum ldlm_cancel_flags cancel_flags) {struct obd_export *exp;int avail, flags, count =1 ;
@@ -1053,7 +1053,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel);* Return the number of cancelled locks. */ int ldlm_cli_cancel_list_local (struct list_head *cancels,int count, -ldlm_cancel_flags_t flags) +enum ldlm_cancel_flags flags) {LIST_HEAD (head);struct ldlm_lock *lock, *next;
@@ -1423,7 +1423,7 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns,int ldlm_cancel_lru_local (struct ldlm_namespace *ns,struct list_head *cancels,int count,int max, -ldlm_cancel_flags_t cancel_flags,int flags) +enum ldlm_cancel_flags cancel_flags,int flags) {int added;
@@ -1442,7 +1442,7 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns,* callback will be performed in this function. */ int ldlm_cancel_lru (struct ldlm_namespace *ns,int nr, -ldlm_cancel_flags_t cancel_flags, +enum ldlm_cancel_flags cancel_flags,int flags) {LIST_HEAD (cancels);
@@ -1467,7 +1467,8 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res,struct list_head *cancels, ldlm_policy_data_t *policy, enum ldlm_mode mode, __u64 lock_flags, - ldlm_cancel_flags_t cancel_flags, void *opaque) + enum ldlm_cancel_flags cancel_flags, + void *opaque) { struct ldlm_lock *lock;int count =0 ;
@@ -1525,7 +1526,8 @@ EXPORT_SYMBOL(ldlm_cancel_resource_local);* Destroy \a cancels at the end. */ int ldlm_cli_cancel_list (struct list_head *cancels,int count, -struct ptlrpc_request *req,ldlm_cancel_flags_t flags) +struct ptlrpc_request *req, +enum ldlm_cancel_flags flags) {struct ldlm_lock *lock;int res =0 ;
@@ -1580,7 +1582,7 @@ int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,const struct ldlm_res_id *res_id, ldlm_policy_data_t *policy, enum ldlm_mode mode, - ldlm_cancel_flags_t flags, + enum ldlm_cancel_flags flags, void *opaque) { struct ldlm_resource *res;
@@ -1636,7 +1638,7 @@ static int ldlm_cli_hash_cancel_unused(struct cfs_hash *hs,* to notify the server. */ int ldlm_cli_cancel_unused (struct ldlm_namespace *ns,const struct ldlm_res_id *res_id, -ldlm_cancel_flags_t flags,void *opaque) +enum ldlm_cancel_flags flags,void *opaque) {struct ldlm_cli_cancel_arg arg = { .lc_flags = flags,
drivers/staging/lustre/lustre/lmv/lmv_obd.c +1 -1
@@ -2491,7 +2491,7 @@ static int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,static int lmv_cancel_unused (struct obd_export *exp,const struct lu_fid *fid,ldlm_policy_data_t *policy,enum ldlm_mode mode, -ldlm_cancel_flags_t flags,void *opaque) +enum ldlm_cancel_flags flags,void *opaque) {struct obd_device *obd = exp->exp_obd;struct lmv_obd *lmv = &obd->u.lmv;
drivers/staging/lustre/lustre/mdc/mdc_internal.h +1 -1
@@ -120,7 +120,7 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data, struct ptlrpc_request **request);int mdc_cancel_unused (struct obd_export *exp,const struct lu_fid *fid,ldlm_policy_data_t *policy,enum ldlm_mode mode, -ldlm_cancel_flags_t flags,void *opaque); +enum ldlm_cancel_flags flags,void *opaque);int mdc_revalidate_lock (struct obd_export *exp,struct lookup_intent *it,struct lu_fid *fid,__u64 *bits);
drivers/staging/lustre/lustre/mdc/mdc_locks.c +1 -1
@@ -171,7 +171,7 @@ int mdc_cancel_unused(struct obd_export *exp,const struct lu_fid *fid, ldlm_policy_data_t *policy, enum ldlm_mode mode, - ldlm_cancel_flags_t flags, + enum ldlm_cancel_flags flags, void *opaque) { struct ldlm_res_id res_id;
Signature · 1 line
2.1.0
PATCH 23/56 staging/lustre/llite: Get rid of se_stat_t typedef
In reply to [email protected]From: Oleg Drokin <[email protected]>
Replace it with enum se_stat
--- drivers/staging/lustre/lustre/llite/statahead.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/lustre/lustre/llite/statahead.c +5 -5
@@ -49,13 +49,13 @@#define SA_OMITTED_ENTRY_MAX 8ULL -typedef enum { +enum se_stat {/** negative values are for error cases */ SA_ENTRY_INIT =0 ,/** init entry */ SA_ENTRY_SUCC =1 ,/** stat succeed */ SA_ENTRY_INVA =2 ,/** invalid entry */ SA_ENTRY_DEST =3 ,/** entry to be destroyed */ -}se_stat_t ; +};struct ll_sa_entry {/* link into sai->sai_entries */
@@ -71,7 +71,7 @@ struct ll_sa_entry {/* low layer ldlm lock handle */ __u64 se_handle;/* entry status */ -se_stat_t se_stat; +enum se_stat se_stat;/* entry size, contains name */ int se_size;/* pointer to async getattr enqueue info */
@@ -366,7 +366,7 @@ ll_sa_entry_fini(struct ll_statahead_info *sai, struct ll_sa_entry *entry)*/ static void do_sa_entry_to_stated (struct ll_statahead_info *sai, -struct ll_sa_entry *entry,se_stat_t stat) +struct ll_sa_entry *entry,enum se_stat stat) {struct ll_sa_entry *se;struct list_head *pos = &sai->sai_entries_stated;
@@ -392,7 +392,7 @@ do_sa_entry_to_stated(struct ll_statahead_info *sai,*/ static int ll_sa_entry_to_stated (struct ll_statahead_info *sai, -struct ll_sa_entry *entry,se_stat_t stat) +struct ll_sa_entry *entry,enum se_stat stat) {struct ll_inode_info *lli =ll_i2info (sai->sai_inode);int ret =1 ;
Signature · 1 line
2.1.0
PATCH 24/56 staging/lustre: Remove lustre_build_version.h
In reply to [email protected]From: Oleg Drokin <[email protected]>
of the two macroses is contained the LUSTRE_RELEASE was unused and BUILD_VERSION is too generically named and was replaced with LUSTRE_VERSION_STRING with all the users (provided by lustre_ver.h)
With in-kernel client the build version should be combined with kernel build information anyway.
--- .../lustre/lustre/include/lustre/lustre_build_version.h | 2 -- drivers/staging/lustre/lustre/obdclass/class_obd.c | 11 +++++------ drivers/staging/lustre/lustre/obdclass/linux/linux-module.c | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h
drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h deleted +0 -2
@@ -1,2 +0,0 @@ -#define BUILD_VERSION "v2_3_64_0-g6e62c21-CHANGED-3.9.0" -#define LUSTRE_RELEASE 3.9.0_g6e62c21
drivers/staging/lustre/lustre/obdclass/class_obd.c +5 -6
@@ -42,7 +42,6 @@#include "../../include/linux/lnet/lnetctl.h" #include "../include/lustre_debug.h" #include "../include/lprocfs_status.h" -#include "../include/lustre/lustre_build_version.h" #include <linux/list.h> #include "../include/cl_object.h" #include "llog_internal.h"
@@ -218,14 +217,14 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) goto out; } -if (strlen (BUILD_VERSION ) +1 > data->ioc_inllen1) { +if (strlen (LUSTRE_VERSION_STRING ) +1 > data->ioc_inllen1) {CERROR ("ioctl buffer too small to hold version\n" ); err = -EINVAL ; goto out; } -memcpy (data->ioc_bulk,BUILD_VERSION , -strlen (BUILD_VERSION ) +1 ); +memcpy (data->ioc_bulk,LUSTRE_VERSION_STRING , +strlen (LUSTRE_VERSION_STRING ) +1 ); err =obd_ioctl_popdata ((void __user *)arg, data, len);if (err)
@@ -481,7 +480,7 @@ static int __init init_obdclass(void)int lustre_register_fs (void ); -LCONSOLE_INFO ("Lustre: Build Version: " BUILD_VERSION "\n" ); +LCONSOLE_INFO ("Lustre: Build Version: " LUSTRE_VERSION_STRING "\n" );spin_lock_init (&obd_types_lock);obd_zombie_impexp_init ();
@@ -579,7 +578,7 @@ static void cleanup_obdclass(void) }MODULE_AUTHOR ("OpenSFS, Inc. <http://www.lustre.org/>" ); -MODULE_DESCRIPTION ("Lustre Class Driver Build Version: " BUILD_VERSION ); +MODULE_DESCRIPTION ("Lustre Class Driver Build Version: " LUSTRE_VERSION_STRING );MODULE_LICENSE ("GPL" );MODULE_VERSION (LUSTRE_VERSION_STRING );
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +0 -1
@@ -70,7 +70,6 @@#include "../../include/obd_class.h" #include "../../include/lprocfs_status.h" #include "../../include/lustre_ver.h" -#include "../../include/lustre/lustre_build_version.h" /* buffer MUST be at least the size of obd_ioctl_hdr */ int obd_ioctl_getdata (char **buf,int *len,void __user *arg)
Signature · 1 line
2.1.0
PATCH 25/56 staging/lustre: Get rid of C99 comments in lustre_idl.h
In reply to [email protected]From: Oleg Drokin <[email protected]>
lustre_idl.h contains various protocol data. In order to avoid reusal of values that might have meant something else in the past, the old no longer used values are commented out, convert the comments into regular comments from C99 where appropriate.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +10 -10
@@ -113,25 +113,25 @@#define CONNMGR_REQUEST_PORTAL 1#define CONNMGR_REPLY_PORTAL 2 -//#define OSC_REQUEST_PORTAL 3 +/*#define OSC_REQUEST_PORTAL 3 */ #define OSC_REPLY_PORTAL 4 -//#define OSC_BULK_PORTAL 5 +/*#define OSC_BULK_PORTAL 5 */ #define OST_IO_PORTAL 6#define OST_CREATE_PORTAL 7#define OST_BULK_PORTAL 8 -//#define MDC_REQUEST_PORTAL 9 +/*#define MDC_REQUEST_PORTAL 9 */ #define MDC_REPLY_PORTAL 10 -//#define MDC_BULK_PORTAL 11 +/*#define MDC_BULK_PORTAL 11 */ #define MDS_REQUEST_PORTAL 12 -//#define MDS_REPLY_PORTAL 13 +/*#define MDS_REPLY_PORTAL 13 */ #define MDS_BULK_PORTAL 14#define LDLM_CB_REQUEST_PORTAL 15#define LDLM_CB_REPLY_PORTAL 16#define LDLM_CANCEL_REQUEST_PORTAL 17#define LDLM_CANCEL_REPLY_PORTAL 18 -//#define PTLBD_REQUEST_PORTAL 19 -//#define PTLBD_REPLY_PORTAL 20 -//#define PTLBD_BULK_PORTAL 21 +/*#define PTLBD_REQUEST_PORTAL 19 */ +/*#define PTLBD_REPLY_PORTAL 20 */ +/*#define PTLBD_BULK_PORTAL 21 */ #define MDS_SETATTR_PORTAL 22#define MDS_READPAGE_PORTAL 23#define OUT_PORTAL 24
@@ -1187,7 +1187,7 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);#define MSG_CONNECT_RECOVERING 0x00000001#define MSG_CONNECT_RECONNECT 0x00000002#define MSG_CONNECT_REPLAYABLE 0x00000004 -//#define MSG_CONNECT_PEER 0x8 +/*#define MSG_CONNECT_PEER 0x8 */ #define MSG_CONNECT_LIBCLIENT 0x00000010#define MSG_CONNECT_INITIAL 0x00000020#define MSG_CONNECT_ASYNC 0x00000040
@@ -2066,7 +2066,7 @@ enum mdt_reint_cmd {REINT_OPEN =6 ,REINT_SETXATTR =7 ,REINT_RMENTRY =8 , -// REINT_WRITE = 9, +/* REINT_WRITE = 9, */ REINT_MAX };
Signature · 1 line
2.1.0
PATCH 26/56 staging/lustre: Remove server-side changelog defines
In reply to [email protected]From: Oleg Drokin <[email protected]>
CHANGELOG_MAGIC, CHANGELOG_MINMASK, CHANGELOG_ALLMASK, CHANGELOG_DEFMASK and CHANGELOG_USER_PREFIX are all unused on the client.
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 11 ----------- 1 file changed, 11 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -11
@@ -3039,15 +3039,6 @@ struct llog_size_change_rec {struct llog_rec_tail lsc_tail; } __packed; -#define CHANGELOG_MAGIC 0xca103000 - -/** \a changelog_rec_type's that can't be masked */ -#define CHANGELOG_MINMASK (1 << CL_MARK) -/** bits covering all \a changelog_rec_type's */ -#define CHANGELOG_ALLMASK 0XFFFFFFFF -/** default \a changelog_rec_type mask */ -#define CHANGELOG_DEFMASK CHANGELOG_ALLMASK & ~(1 << CL_ATIME | 1 << CL_CLOSE) -/* changelog llog name, needed by client replicators */ #define CHANGELOG_CATALOG "changelog_catalog"
@@ -3069,8 +3060,6 @@ struct llog_changelog_ext_rec {struct llog_rec_tail cr_tail;/**< for_sizezof_only */ } __packed; -#define CHANGELOG_USER_PREFIX "cl" -struct llog_changelog_user_rec {struct llog_rec_hdr cur_hdr;__u32 cur_id;
Signature · 1 line
2.1.0
PATCH 27/56 staging/lustre: Remove FSF mailing address from GPL notices
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch removes remaining several places that still had that extra paragraph included in Lustre code.
--- drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h | 5 ----- drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h | 5 ----- drivers/staging/lustre/lnet/lnet/lib-ptl.c | 5 ----- drivers/staging/lustre/lustre/obdecho/echo_internal.h | 5 ----- drivers/staging/lustre/lustre/osc/osc_quota.c | 5 ----- 5 files changed, 25 deletions(-)
drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h +0 -5
@@ -13,11 +13,6 @@* General Public License version 2 for more details (a copy is included * in the LICENSE file that accompanied this code). * -* You should have received a copy of the GNU General Public License -* version 2 along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA -* * GPL HEADER END */ /*
drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h +0 -5
@@ -13,11 +13,6 @@* General Public License version 2 for more details (a copy is included * in the LICENSE file that accompanied this code). * -* You should have received a copy of the GNU General Public License -* version 2 along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA -* * GPL HEADER END */ /*
drivers/staging/lustre/lnet/lnet/lib-ptl.c +0 -5
@@ -13,11 +13,6 @@* General Public License version 2 for more details (a copy is included * in the LICENSE file that accompanied this code). * -* You should have received a copy of the GNU General Public License -* version 2 along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA -* * GPL HEADER END */ /*
drivers/staging/lustre/lustre/obdecho/echo_internal.h +0 -5
@@ -13,11 +13,6 @@* General Public License version 2 for more details (a copy is included * in the LICENSE file that accompanied this code). * -* You should have received a copy of the GNU General Public License -* version 2 along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA -* * GPL HEADER END */ /*
drivers/staging/lustre/lustre/osc/osc_quota.c +0 -5
@@ -13,11 +13,6 @@* General Public License version 2 for more details (a copy is included * in the LICENSE file that accompanied this code). * -* You should have received a copy of the GNU General Public License -* version 2 along with this program; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 021110-1307, USA -* * GPL HEADER END */ /*
Signature · 1 line
2.1.0
PATCH 28/56 staging/lustre: Remove server-only values from enum lu_dirent_attrs
In reply to [email protected]From: Oleg Drokin <[email protected]>
These values cannot be seen on the client so we probably should not even be aware of them on the client.
--- .../staging/lustre/lustre/include/lustre/lustre_idl.h | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -16
@@ -880,24 +880,8 @@ enum lu_dirent_attrs {LUDA_FID =0x0001 ,LUDA_TYPE =0x0002 , LUDA_64BITHASH = 0x0004, - -/* The following attrs are used for MDT internal only, -* not visible to client */ - -/* Verify the dirent consistency */ -LUDA_VERIFY =0x8000 , -/* Only check but not repair the dirent inconsistency */ -LUDA_VERIFY_DRYRUN =0x4000 , -/* The dirent has been repaired, or to be repaired (dryrun). */ -LUDA_REPAIR =0x2000 , -/* The system is upgraded, has beed or to be repaired (dryrun). */ -LUDA_UPGRADE =0x1000 , -/* Ignore this record, go to next directly. */ - LUDA_IGNORE = 0x0800, }; -#define LU_DIRENT_ATTRS_MASK 0xf800 -/** * Layout of readdir pages, as transmitted on wire. */
Signature · 1 line
2.1.0
PATCH 29/56 staging/lustre: Remove *_CONNECT_SUPPORTED defines
In reply to [email protected]From: Oleg Drokin <[email protected]>
These defines are only used on the servers to determine what connect flags corresponding servers support:MDT_CONNECT_SUPPORTEDOST_CONNECT_SUPPORTEDMGS_CONNECT_SUPPORTEDECHO_CONNECT_SUPPORTED
--- .../lustre/lustre/include/lustre/lustre_idl.h | 50 ++-------------------- 1 file changed, 4 insertions(+), 46 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +4 -46
@@ -1248,61 +1248,19 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);* submit a small patch against EVERY branch that ONLY adds the new flag, * updates obd_connect_names[] for lprocfs_rd_connect_flags(), adds the * flag to check_obd_connect_data(), and updates wiretests accordingly, so it -* can be approved and landed easily to reserve the flag for future use. */ +* can be approved and landed easily to reserve the flag for future use. +*/ /* The MNE_SWAB flag is overloading the MDS_MDS bit only for the MGS * connection. It is a temporary bug fix for Imperative Recovery interop * between 2.2 and 2.3 x86/ppc nodes, and can be removed when interop for -* 2.2 clients/servers is no longer needed. LU-1252/LU-1644. */ +* 2.2 clients/servers is no longer needed. LU-1252/LU-1644. +*/ #define OBD_CONNECT_MNE_SWAB OBD_CONNECT_MDS_MDS#define OCD_HAS_FLAG (ocd, flg) \ (!!((ocd)->ocd_connect_flags & OBD_CONNECT_##flg)) -#define LRU_RESIZE_CONNECT_FLAG OBD_CONNECT_LRU_RESIZE - -#define MDT_CONNECT_SUPPORTED (OBD_CONNECT_RDONLY | OBD_CONNECT_VERSION | \ - OBD_CONNECT_ACL | OBD_CONNECT_XATTR | \ - OBD_CONNECT_IBITS | \ - OBD_CONNECT_NODEVOH | OBD_CONNECT_ATTRFID | \ - OBD_CONNECT_CANCELSET | OBD_CONNECT_AT | \ - OBD_CONNECT_RMT_CLIENT | \ - OBD_CONNECT_RMT_CLIENT_FORCE | \ - OBD_CONNECT_BRW_SIZE | OBD_CONNECT_MDS_CAPA | \ - OBD_CONNECT_OSS_CAPA | OBD_CONNECT_MDS_MDS | \ - OBD_CONNECT_FID | LRU_RESIZE_CONNECT_FLAG | \ - OBD_CONNECT_VBR | OBD_CONNECT_LOV_V3 | \ - OBD_CONNECT_SOM | OBD_CONNECT_FULL20 | \ - OBD_CONNECT_64BITHASH | OBD_CONNECT_JOBSTATS | \ - OBD_CONNECT_EINPROGRESS | \ - OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_UMASK | \ - OBD_CONNECT_LVB_TYPE | OBD_CONNECT_LAYOUTLOCK |\ - OBD_CONNECT_PINGLESS | OBD_CONNECT_MAX_EASIZE |\ - OBD_CONNECT_FLOCK_DEAD | \ - OBD_CONNECT_DISP_STRIPE) - -#define OST_CONNECT_SUPPORTED (OBD_CONNECT_SRVLOCK | OBD_CONNECT_GRANT | \ - OBD_CONNECT_REQPORTAL | OBD_CONNECT_VERSION | \ - OBD_CONNECT_TRUNCLOCK | OBD_CONNECT_INDEX | \ - OBD_CONNECT_BRW_SIZE | OBD_CONNECT_OSS_CAPA | \ - OBD_CONNECT_CANCELSET | OBD_CONNECT_AT | \ - LRU_RESIZE_CONNECT_FLAG | OBD_CONNECT_CKSUM | \ - OBD_CONNECT_RMT_CLIENT | \ - OBD_CONNECT_RMT_CLIENT_FORCE | OBD_CONNECT_VBR | \ - OBD_CONNECT_MDS | OBD_CONNECT_SKIP_ORPHAN | \ - OBD_CONNECT_GRANT_SHRINK | OBD_CONNECT_FULL20 | \ - OBD_CONNECT_64BITHASH | OBD_CONNECT_MAXBYTES | \ - OBD_CONNECT_MAX_EASIZE | \ - OBD_CONNECT_EINPROGRESS | \ - OBD_CONNECT_JOBSTATS | \ - OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_LVB_TYPE|\ - OBD_CONNECT_LAYOUTLOCK | OBD_CONNECT_FID | \ - OBD_CONNECT_PINGLESS) -#define ECHO_CONNECT_SUPPORTED (0) -#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION | OBD_CONNECT_AT | \ - OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV | \ - OBD_CONNECT_MNE_SWAB | OBD_CONNECT_PINGLESS) -/* Features required for this version of the client to work with server */ #define CLIENT_CONNECT_MDT_REQD (OBD_CONNECT_IBITS | OBD_CONNECT_FID | \ OBD_CONNECT_FULL20)
Signature · 1 line
2.1.0
PATCH 30/56 staging/lustre: Remove duplicated quota defines
In reply to [email protected]From: Oleg Drokin <[email protected]>
QUOTABLOCK_BITS, QUOTABLOCK_SIZE and toqb are only used on the server and are copied from kernel code anyway.
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 12 ------------ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 5 ----- 2 files changed, 17 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -12
@@ -1778,18 +1778,6 @@ void lustre_swab_ost_lvb(struct ost_lvb *lvb);* lquota data structures */ -#ifndef QUOTABLOCK_BITS -#define QUOTABLOCK_BITS 10 -#endif - -#ifndef QUOTABLOCK_SIZE -#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS) -#endif - -#ifndef toqb -#define toqb (x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS) -#endif -/* The lquota_id structure is an union of all the possible identifier types that * can be used with quota, this includes: * - 64-bit user ID
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -5
@@ -1507,11 +1507,6 @@ void lustre_assert_wire_constants(void)LASSERTF ((int )sizeof (union lquota_id ) ==16 ,"found %lld\n" , (long long )(int )sizeof (union lquota_id )); -LASSERTF (QUOTABLOCK_BITS ==10 ,"found %lld\n" , - (long long )QUOTABLOCK_BITS ); -LASSERTF (QUOTABLOCK_SIZE ==1024 ,"found %lld\n" , - (long long )QUOTABLOCK_SIZE ); -/* Checks for struct obd_quotactl */ LASSERTF ((int )sizeof (struct obd_quotactl ) ==112 ,"found %lld\n" , (long long )(int )sizeof (struct obd_quotactl ));
Signature · 1 line
2.1.0
PATCH 31/56 staging/lustre: Remove unused struct quota_body
In reply to [email protected]From: Oleg Drokin <[email protected]>
It's only used for communications between servers.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 31 --------------- .../lustre/lustre/include/lustre_req_layout.h | 3 -- drivers/staging/lustre/lustre/ptlrpc/layout.c | 36 ------------------ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 10 ----- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 44 ---------------------- 5 files changed, 124 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -31
@@ -1819,37 +1819,6 @@ do { \Q_COPY (out, in, qc_dqblk); \ }while (0 ) -/* Body of quota request used for quota acquire/release RPCs between quota -* master (aka QMT) and slaves (ak QSD). */ -struct quota_body { -struct lu_fid qb_fid;/* FID of global index packing the pool ID -* and type (data or metadata) as well as -* the quota type (user or group). */ -union lquota_id qb_id;/* uid or gid or directory FID */ -__u32 qb_flags;/* see below */ -__u32 qb_padding; -__u64 qb_count;/* acquire/release count (kbytes/inodes) */ -__u64 qb_usage;/* current slave usage (kbytes/inodes) */ -__u64 qb_slv_ver;/* slave index file version */ -struct lustre_handle qb_lockh;/* per-ID lock handle */ -struct lustre_handle qb_glb_lockh;/* global lock handle */ -__u64 qb_padding1[4 ]; -}; - -/* When the quota_body is used in the reply of quota global intent -* lock (IT_QUOTA_CONN) reply, qb_fid contains slave index file FID. */ -#define qb_slv_fid qb_fid -/* qb_usage is the current qunit (in kbytes/inodes) when quota_body is used in -* quota reply */ -#define qb_qunit qb_usage - -#define QUOTA_DQACQ_FL_ACQ 0x1/* acquire quota */ -#define QUOTA_DQACQ_FL_PREACQ 0x2/* pre-acquire */ -#define QUOTA_DQACQ_FL_REL 0x4/* release quota */ -#define QUOTA_DQACQ_FL_REPORT 0x8/* report usage */ - -void lustre_swab_quota_body (struct quota_body *b); -/* Quota types currently supported */ enum { LQUOTA_TYPE_USR = 0x00, /* maps to USRQUOTA */
drivers/staging/lustre/lustre/include/lustre_req_layout.h +0 -3
@@ -176,7 +176,6 @@ extern struct req_format RQF_MDS_REINT_SETXATTR;extern struct req_format RQF_MDS_QUOTACHECK ;extern struct req_format RQF_MDS_QUOTACTL ;extern struct req_format RQF_QC_CALLBACK ; -extern struct req_format RQF_QUOTA_DQACQ ;extern struct req_format RQF_MDS_SWAP_LAYOUTS ;/* MDS hsm formats */ extern struct req_format RQF_MDS_HSM_STATE_GET ;
@@ -219,7 +218,6 @@ extern struct req_format RQF_LDLM_INTENT_OPEN;extern struct req_format RQF_LDLM_INTENT_CREATE ;extern struct req_format RQF_LDLM_INTENT_UNLINK ;extern struct req_format RQF_LDLM_INTENT_GETXATTR ; -extern struct req_format RQF_LDLM_INTENT_QUOTA ;extern struct req_format RQF_LDLM_CANCEL ;extern struct req_format RQF_LDLM_CALLBACK ;extern struct req_format RQF_LDLM_CP_CALLBACK ;
@@ -276,7 +274,6 @@ extern struct req_msg_field RMF_CAPA1;extern struct req_msg_field RMF_CAPA2 ;extern struct req_msg_field RMF_OBD_QUOTACHECK ;extern struct req_msg_field RMF_OBD_QUOTACTL ; -extern struct req_msg_field RMF_QUOTA_BODY ;extern struct req_msg_field RMF_STRING ;extern struct req_msg_field RMF_SWAP_LAYOUTS ;extern struct req_msg_field RMF_MDS_HSM_PROGRESS ;
drivers/staging/lustre/lustre/ptlrpc/layout.c +0 -36
@@ -118,25 +118,6 @@ static const struct req_msg_field *quotactl_only[] = { &RMF_OBD_QUOTACTL }; -static const struct req_msg_field *quota_body_only[] = { - &RMF_PTLRPC_BODY , - &RMF_QUOTA_BODY -}; - -static const struct req_msg_field *ldlm_intent_quota_client[] = { - &RMF_PTLRPC_BODY , - &RMF_DLM_REQ , - &RMF_LDLM_INTENT , - &RMF_QUOTA_BODY -}; - -static const struct req_msg_field *ldlm_intent_quota_server[] = { - &RMF_PTLRPC_BODY , - &RMF_DLM_REP , - &RMF_DLM_LVB , - &RMF_QUOTA_BODY -}; -static const struct req_msg_field *mdt_close_client[] = { &RMF_PTLRPC_BODY , &RMF_MDT_EPOCH ,
@@ -748,8 +729,6 @@ static struct req_format *req_formats[] = { &RQF_LDLM_INTENT_CREATE , &RQF_LDLM_INTENT_UNLINK , &RQF_LDLM_INTENT_GETXATTR , - &RQF_LDLM_INTENT_QUOTA , - &RQF_QUOTA_DQACQ , &RQF_LOG_CANCEL , &RQF_LLOG_ORIGIN_HANDLE_CREATE , &RQF_LLOG_ORIGIN_HANDLE_DESTROY,
@@ -888,11 +867,6 @@ struct req_msg_field RMF_OBD_QUOTACTL = lustre_swab_obd_quotactl, NULL);EXPORT_SYMBOL (RMF_OBD_QUOTACTL ); -struct req_msg_field RMF_QUOTA_BODY = -DEFINE_MSGF ("quota_body" ,0 , -sizeof (struct quota_body ), lustre_swab_quota_body,NULL ); -EXPORT_SYMBOL (RMF_QUOTA_BODY ); -struct req_msg_field RMF_MDT_EPOCH =DEFINE_MSGF ("mdt_ioepoch" ,0 ,sizeof (struct mdt_ioepoch ), lustre_swab_mdt_ioepoch,NULL );
@@ -1233,16 +1207,6 @@ struct req_format RQF_QC_CALLBACK =DEFINE_REQ_FMT0 ("QC_CALLBACK" , quotactl_only, empty);EXPORT_SYMBOL (RQF_QC_CALLBACK ); -struct req_format RQF_QUOTA_DQACQ = -DEFINE_REQ_FMT0 ("QUOTA_DQACQ" , quota_body_only, quota_body_only); -EXPORT_SYMBOL (RQF_QUOTA_DQACQ ); - -struct req_format RQF_LDLM_INTENT_QUOTA = -DEFINE_REQ_FMT0 ("LDLM_INTENT_QUOTA" , - ldlm_intent_quota_client, - ldlm_intent_quota_server); -EXPORT_SYMBOL (RQF_LDLM_INTENT_QUOTA ); -struct req_format RQF_MDS_GETSTATUS =DEFINE_REQ_FMT0 ("MDS_GETSTATUS" , mdt_body_only, mdt_body_capa);EXPORT_SYMBOL (RQF_MDS_GETSTATUS );
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +0 -10
@@ -2033,16 +2033,6 @@ void lustre_swab_ldlm_reply(struct ldlm_reply *r) }EXPORT_SYMBOL (lustre_swab_ldlm_reply); -void lustre_swab_quota_body (struct quota_body *b) -{ -lustre_swab_lu_fid (&b->qb_fid); -lustre_swab_lu_fid ((struct lu_fid *)&b->qb_id); -__swab32s (&b->qb_flags); -__swab64s (&b->qb_count); -__swab64s (&b->qb_usage); -__swab64s (&b->qb_slv_ver); -} -/* Dump functions */ void dump_ioo (struct obd_ioobj *ioo) {
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 32/56 staging/lustre: Remove lquota_glb_rec, lquota_slv_rec and lquota_acct_rec
In reply to [email protected]From: Oleg Drokin <[email protected]>
These server-only structures and some supporting defines are unused on the client.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 52 ---------------------- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 44 ------------------ 2 files changed, 96 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -52
@@ -1819,58 +1819,6 @@ do { \Q_COPY (out, in, qc_dqblk); \ }while (0 ) -/* Quota types currently supported */ -enum { -LQUOTA_TYPE_USR =0x00 ,/* maps to USRQUOTA */ -LQUOTA_TYPE_GRP =0x01 ,/* maps to GRPQUOTA */ - LQUOTA_TYPE_MAX -}; - -/* There are 2 different resource types on which a quota limit can be enforced: -* - inodes on the MDTs -* - blocks on the OSTs */ -enum { -LQUOTA_RES_MD =0x01 ,/* skip 0 to avoid null oid in FID */ -LQUOTA_RES_DT =0x02 , -LQUOTA_LAST_RES , -LQUOTA_FIRST_RES =LQUOTA_RES_MD -}; - -#define LQUOTA_NR_RES (LQUOTA_LAST_RES - LQUOTA_FIRST_RES + 1) - -/* -* Space accounting support -* Format of an accounting record, providing disk usage information for a given -* user or group -*/ -struct lquota_acct_rec {/* 16 bytes */ -__u64 bspace;/* current space in use */ -__u64 ispace;/* current # inodes in use */ -}; - -/* -* Global quota index support -* Format of a global record, providing global quota settings for a given quota -* identifier -*/ -struct lquota_glb_rec {/* 32 bytes */ -__u64 qbr_hardlimit;/* quota hard limit, in #inodes or kbytes */ -__u64 qbr_softlimit;/* quota soft limit, in #inodes or kbytes */ -__u64 qbr_time;/* grace time, in seconds */ -__u64 qbr_granted;/* how much is granted to slaves, in #inodes or -* kbytes */ -}; - -/* -* Slave index support -* Format of a slave record, recording how much space is granted to a given -* slave -*/ -struct lquota_slv_rec {/* 8 bytes */ -__u64 qsr_granted;/* space granted to the slave for the key=ID, -* in #inodes or kbytes */ -}; -/* Data structures associated with the quota locks */ /* Glimpse descriptor used for the index & per-ID quota locks */
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -44
56 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 33/56 staging/lustre: S_DIRSYNC is always defined in kernel
In reply to [email protected]From: Oleg Drokin <[email protected]>
No need to check for it.
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -4
@@ -2013,9 +2013,7 @@ static inline int ll_ext_to_inode_flags(int flags)return (((flags &LUSTRE_SYNC_FL ) ?S_SYNC :0 ) | ((flags &LUSTRE_NOATIME_FL ) ?S_NOATIME :0 ) | ((flags &LUSTRE_APPEND_FL ) ?S_APPEND :0 ) | -#if defined(S_DIRSYNC) ((flags &LUSTRE_DIRSYNC_FL ) ?S_DIRSYNC :0 ) | -#endif ((flags &LUSTRE_IMMUTABLE_FL ) ?S_IMMUTABLE :0 )); }
@@ -2024,9 +2022,7 @@ static inline int ll_inode_to_ext_flags(int iflags)return (((iflags &S_SYNC ) ?LUSTRE_SYNC_FL :0 ) | ((iflags &S_NOATIME ) ?LUSTRE_NOATIME_FL :0 ) | ((iflags &S_APPEND ) ?LUSTRE_APPEND_FL :0 ) | -#if defined(S_DIRSYNC) ((iflags &S_DIRSYNC ) ?LUSTRE_DIRSYNC_FL :0 ) | -#endif ((iflags &S_IMMUTABLE ) ?LUSTRE_IMMUTABLE_FL :0 )); }
Signature · 1 line
2.1.0
PATCH 34/56 staging/lustre: FMODE_READ and FMODE_WRITE are always defined in the kernel
In reply to [email protected]From: Oleg Drokin <[email protected]>
So no need to see if they are.
--- drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -5
@@ -2158,11 +2158,6 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);#define MDS_ATTR_FROM_OPEN 0x4000ULL/* = 16384, called from open path, ie O_TRUNC */ #define MDS_ATTR_BLOCKS 0x8000ULL/* = 32768 */ -#ifndef FMODE_READ -#define FMODE_READ 00000001 -#define FMODE_WRITE 00000002 -#endif -#define MDS_FMODE_CLOSED 00000000#define MDS_FMODE_EXEC 00000004/* IO Epoch is opened on a closed file. */
Signature · 1 line
2.1.0
PATCH 35/56 staging/lustre: Remove index file transfer structures
In reply to [email protected]From: Oleg Drokin <[email protected]>
struct idx_info, struct lu_idxpage, lustre_swab_idx_info, request formats and related defines are all unused and could only happen for between-servers communications, so remove them from the client code.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 86 -------------------- .../lustre/lustre/include/lustre_req_layout.h | 2 - drivers/staging/lustre/lustre/ptlrpc/layout.c | 21 ----- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 14 ---- drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 95 ---------------------- 5 files changed, 218 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +0 -86
@@ -3168,92 +3168,6 @@ void dump_ioo(struct obd_ioobj *nb);void dump_ost_body (struct ost_body *ob);void dump_rcs (__u32 *rc); -#define IDX_INFO_MAGIC 0x3D37CC37 - -/* Index file transfer through the network. The server serializes the index into -* a byte stream which is sent to the client via a bulk transfer */ -struct idx_info { -__u32 ii_magic; - -/* reply: see idx_info_flags below */ -__u32 ii_flags; - -/* request & reply: number of lu_idxpage (to be) transferred */ -__u16 ii_count; -__u16 ii_pad0; - -/* request: requested attributes passed down to the iterator API */ -__u32 ii_attrs; - -/* request & reply: index file identifier (FID) */ -struct lu_fid ii_fid; - -/* reply: version of the index file before starting to walk the index. -* Please note that the version can be modified at any time during the -* transfer */ -__u64 ii_version; - -/* request: hash to start with: -* reply: hash of the first entry of the first lu_idxpage and hash -* of the entry to read next if any */ -__u64 ii_hash_start; -__u64 ii_hash_end; - -/* reply: size of keys in lu_idxpages, minimal one if II_FL_VARKEY is -* set */ -__u16 ii_keysize; - -/* reply: size of records in lu_idxpages, minimal one if II_FL_VARREC -* is set */ -__u16 ii_recsize; - -__u32 ii_pad1; -__u64 ii_pad2; -__u64 ii_pad3; -}; - -void lustre_swab_idx_info (struct idx_info *ii); - -#define II_END_OFF MDS_DIR_END_OFF/* all entries have been read */ - -/* List of flags used in idx_info::ii_flags */ -enum idx_info_flags { -II_FL_NOHASH =1 <<0 ,/* client doesn't care about hash value */ -II_FL_VARKEY =1 <<1 ,/* keys can be of variable size */ -II_FL_VARREC =1 <<2 ,/* records can be of variable size */ -II_FL_NONUNQ =1 <<3 ,/* index supports non-unique keys */ -}; - -#define LIP_MAGIC 0x8A6D6B6C - -/* 4KB (= LU_PAGE_SIZE) container gathering key/record pairs */ -struct lu_idxpage { -/* 16-byte header */ -__u32 lip_magic; -__u16 lip_flags; -__u16 lip_nr;/* number of entries in the container */ -__u64 lip_pad0;/* additional padding for future use */ - -/* key/record pairs are stored in the remaining 4080 bytes. -* depending upon the flags in idx_info::ii_flags, each key/record -* pair might be preceded by: -* - a hash value -* - the key size (II_FL_VARKEY is set) -* - the record size (II_FL_VARREC is set) -* -* For the time being, we only support fixed-size key & record. */ -char lip_entries[0 ]; -}; - -#define LIP_HDR_SIZE (offsetof(struct lu_idxpage, lip_entries)) - -/* Gather all possible type associated with a 4KB container */ -union lu_page { -struct lu_dirpage lp_dir;/* for MDS_READPAGE */ -struct lu_idxpage lp_idx;/* for OBD_IDX_READ */ -char lp_array[LU_PAGE_SIZE ]; -}; -/* security opcodes */ enum sec_cmd {SEC_CTX_INIT =801 ,
drivers/staging/lustre/lustre/include/lustre_req_layout.h +0 -2
@@ -130,7 +130,6 @@ void req_layout_fini(void);extern struct req_format RQF_OBD_PING ;extern struct req_format RQF_OBD_SET_INFO ;extern struct req_format RQF_SEC_CTX ; -extern struct req_format RQF_OBD_IDX_READ ;/* MGS req_format */ extern struct req_format RQF_MGS_TARGET_REG ;extern struct req_format RQF_MGS_SET_INFO ;
@@ -249,7 +248,6 @@ extern struct req_msg_field RMF_SETINFO_KEY;extern struct req_msg_field RMF_GETINFO_VAL ;extern struct req_msg_field RMF_GETINFO_VALLEN ;extern struct req_msg_field RMF_GETINFO_KEY ; -extern struct req_msg_field RMF_IDX_INFO ;extern struct req_msg_field RMF_CLOSE_DATA ;/*
drivers/staging/lustre/lustre/ptlrpc/layout.c +0 -21
@@ -522,16 +522,6 @@ static const struct req_msg_field *llog_origin_handle_next_block_server[] = { &RMF_EADATA }; -static const struct req_msg_field *obd_idx_read_client[] = { - &RMF_PTLRPC_BODY , - &RMF_IDX_INFO -}; - -static const struct req_msg_field *obd_idx_read_server[] = { - &RMF_PTLRPC_BODY , - &RMF_IDX_INFO -}; -static const struct req_msg_field *ost_body_only[] = { &RMF_PTLRPC_BODY , &RMF_OST_BODY
@@ -647,7 +637,6 @@ static const struct req_msg_field *mdt_hsm_request[] = {static struct req_format *req_formats[] = { &RQF_OBD_PING , &RQF_OBD_SET_INFO , - &RQF_OBD_IDX_READ , &RQF_SEC_CTX , &RQF_MGS_TARGET_REG , &RQF_MGS_SET_INFO ,
@@ -1068,10 +1057,6 @@ struct req_msg_field RMF_FIEMAP_VAL =DEFINE_MSGF ("fiemap" ,0 ,-1 , lustre_swab_fiemap,NULL );EXPORT_SYMBOL (RMF_FIEMAP_VAL ); -struct req_msg_field RMF_IDX_INFO = -DEFINE_MSGF ("idx_info" ,0 ,sizeof (struct idx_info ), - lustre_swab_idx_info,NULL ); -EXPORT_SYMBOL (RMF_IDX_INFO );struct req_msg_field RMF_HSM_USER_STATE =DEFINE_MSGF ("hsm_user_state" ,0 ,sizeof (struct hsm_user_state ), lustre_swab_hsm_user_state,NULL );
@@ -1150,12 +1135,6 @@ struct req_format RQF_OBD_SET_INFO =DEFINE_REQ_FMT0 ("OBD_SET_INFO" , obd_set_info_client, empty);EXPORT_SYMBOL (RQF_OBD_SET_INFO ); -/* Read index file through the network */ -struct req_format RQF_OBD_IDX_READ = -DEFINE_REQ_FMT0 ("OBD_IDX_READ" , - obd_idx_read_client, obd_idx_read_server); -EXPORT_SYMBOL (RQF_OBD_IDX_READ ); -struct req_format RQF_SEC_CTX =DEFINE_REQ_FMT0 ("SEC_CTX" , empty, empty);EXPORT_SYMBOL (RQF_SEC_CTX );
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +0 -14
@@ -1846,20 +1846,6 @@ void lustre_swab_fiemap(struct ll_user_fiemap *fiemap) }EXPORT_SYMBOL (lustre_swab_fiemap); -void lustre_swab_idx_info (struct idx_info *ii) -{ -__swab32s (&ii->ii_magic); -__swab32s (&ii->ii_flags); -__swab16s (&ii->ii_count); -__swab32s (&ii->ii_attrs); -lustre_swab_lu_fid (&ii->ii_fid); -__swab64s (&ii->ii_version); -__swab64s (&ii->ii_hash_start); -__swab64s (&ii->ii_hash_end); -__swab16s (&ii->ii_keysize); -__swab16s (&ii->ii_recsize); -} -void lustre_swab_mdt_rec_reint (struct mdt_rec_reint *rr) {__swab32s (&rr->rr_opcode);
drivers/staging/lustre/lustre/ptlrpc/wiretest.c +0 -95
107 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 36/56 staging/lustre: Remove server data from struct obd_export
In reply to [email protected]From: Oleg Drokin <[email protected]>
Despite it's name struct obd_export could exist on the client too (used for reverse exports), but all the actual server bits are not needed there, so could be dropped. This is mostly various target-related stuff.
--- .../staging/lustre/lustre/include/lustre_export.h | 70 ---------------------- 1 file changed, 70 deletions(-)
drivers/staging/lustre/lustre/include/lustre_export.h +0 -70
@@ -50,62 +50,6 @@#include "lustre/lustre_idl.h" #include "lustre_dlm.h" -struct mds_client_data ; -struct mdt_client_data ; -struct mds_idmap_table ; -struct mdt_idmap_table ; - -/** -* Target-specific export data -*/ -struct tg_export_data { -/** Protects led_lcd below */ -struct mutex ted_lcd_lock; -/** Per-client data for each export */ -struct lsd_client_data *ted_lcd; -/** Offset of record in last_rcvd file */ -loff_t ted_lr_off; -/** Client index in last_rcvd file */ -int ted_lr_idx; -}; - -/** -* MDT-specific export data -*/ -struct mdt_export_data { -struct tg_export_data med_ted; -/** List of all files opened by client on this MDT */ -struct list_head med_open_head; -spinlock_t med_open_lock;/* med_open_head, mfd_list */ -/** Bitmask of all ibit locks this MDT understands */ -__u64 med_ibits_known; -struct mutex med_idmap_mutex; -struct lustre_idmap_table *med_idmap; -}; - -struct ec_export_data {/* echo client */ -struct list_head eced_locks; -}; - -/* In-memory access to client data from OST struct */ -/** Filter (oss-side) specific import data */ -struct filter_export_data { -struct tg_export_data fed_ted; -spinlock_t fed_lock;/**< protects fed_mod_list */ -long fed_dirty;/* in bytes */ -long fed_grant;/* in bytes */ -struct list_head fed_mod_list;/* files being modified */ -int fed_mod_count;/* items in fed_writing list */ -long fed_pending;/* bytes just being written */ -__u32 fed_group; -__u8 fed_pagesize;/* log2 of client page size */ -}; - -struct mgs_export_data { -struct list_head med_clients;/* mgc fs client via this exp */ -spinlock_t med_lock;/* protect med_clients */ -}; -enum obd_option {OBD_OPT_FORCE =0x0001 ,OBD_OPT_FAILOVER =0x0002 ,
@@ -200,22 +144,8 @@ struct obd_export {/** blocking dlm lock list, protected by exp_bl_list_lock */ struct list_head exp_bl_list;spinlock_t exp_bl_list_lock; - -/** Target specific data */ -union { -struct tg_export_data eu_target_data; -struct mdt_export_data eu_mdt_data; -struct filter_export_data eu_filter_data; -struct ec_export_data eu_ec_data; -struct mgs_export_data eu_mgs_data; - } u; }; -#define exp_target_data u.eu_target_data -#define exp_mdt_data u.eu_mdt_data -#define exp_filter_data u.eu_filter_data -#define exp_ec_data u.eu_ec_data -static inline __u64 *exp_connect_flags_ptr (struct obd_export *exp) {return &exp->exp_connect_data.ocd_connect_flags;
Signature · 1 line
2.1.0
PATCH 37/56 staging/lustre: Remove last_rcvd-file related data
In reply to [email protected]From: Oleg Drokin <[email protected]>
last_rcvd (last received) is a special server-side file on the Lustre FS that stores information about server filesystem and also list of connected clients and their state. There's no point in having any of tha ton the client, though.
--- .../staging/lustre/lustre/include/lustre_disk.h | 225 --------------------- 1 file changed, 225 deletions(-)
drivers/staging/lustre/lustre/include/lustre_disk.h +0 -225
@@ -116,231 +116,6 @@ struct lustre_mount_data {#define LR_EXPIRE_INTERVALS 16/**< number of intervals to track transno */ #define ENOENT_VERSION 1/** 'virtual' version of non-existent object */ -#define LR_SERVER_SIZE 512 -#define LR_CLIENT_START 8192 -#define LR_CLIENT_SIZE 128 -#if LR_CLIENT_START <LR_SERVER_SIZE -#error "Can't have LR_CLIENT_START < LR_SERVER_SIZE" -#endif - -/* -* This limit is arbitrary (131072 clients on x86), but it is convenient to use -* 2^n * PAGE_CACHE_SIZE * 8 for the number of bits that fit an order-n allocation. -* If we need more than 131072 clients (order-2 allocation on x86) then this -* should become an array of single-page pointers that are allocated on demand. -*/ -#if (128 *1024UL ) > (PAGE_CACHE_SIZE *8 ) -#define LR_MAX_CLIENTS (128 * 1024UL) -#else -#define LR_MAX_CLIENTS (PAGE_CACHE_SIZE * 8) -#endif - -/** COMPAT_146: this is an OST (temporary) */ -#define OBD_COMPAT_OST 0x00000002 -/** COMPAT_146: this is an MDT (temporary) */ -#define OBD_COMPAT_MDT 0x00000004 -/** 2.0 server, interop flag to show server version is changed */ -#define OBD_COMPAT_20 0x00000008 - -/** MDS handles LOV_OBJID file */ -#define OBD_ROCOMPAT_LOVOBJID 0x00000001 - -/** OST handles group subdirs */ -#define OBD_INCOMPAT_GROUPS 0x00000001 -/** this is an OST */ -#define OBD_INCOMPAT_OST 0x00000002 -/** this is an MDT */ -#define OBD_INCOMPAT_MDT 0x00000004 -/** common last_rvcd format */ -#define OBD_INCOMPAT_COMMON_LR 0x00000008 -/** FID is enabled */ -#define OBD_INCOMPAT_FID 0x00000010 -/** Size-on-MDS is enabled */ -#define OBD_INCOMPAT_SOM 0x00000020 -/** filesystem using iam format to store directory entries */ -#define OBD_INCOMPAT_IAM_DIR 0x00000040 -/** LMA attribute contains per-inode incompatible flags */ -#define OBD_INCOMPAT_LMA 0x00000080 -/** lmm_stripe_count has been shrunk from __u32 to __u16 and the remaining 16 -* bits are now used to store a generation. Once we start changing the layout -* and bumping the generation, old versions expecting a 32-bit lmm_stripe_count -* will be confused by interpreting stripe_count | gen << 16 as the actual -* stripe count */ -#define OBD_INCOMPAT_LMM_VER 0x00000100 -/** multiple OI files for MDT */ -#define OBD_INCOMPAT_MULTI_OI 0x00000200 - -/* Data stored per server@the head of the last_rcvd file. In le32 order. -This should be common to filter_internal.h, lustre_mds.h */ -struct lr_server_data { -__u8 lsd_uuid[40 ];/* server UUID */ -__u64 lsd_last_transno;/* last completed transaction ID */ -__u64 lsd_compat14;/* reserved - compat with old last_rcvd */ -__u64 lsd_mount_count;/* incarnation number */ -__u32 lsd_feature_compat;/* compatible feature flags */ -__u32 lsd_feature_rocompat;/* read-only compatible feature flags */ -__u32 lsd_feature_incompat;/* incompatible feature flags */ -__u32 lsd_server_size;/* size of server data area */ -__u32 lsd_client_start;/* start of per-client data area */ -__u16 lsd_client_size;/* size of per-client data area */ -__u16 lsd_subdir_count;/* number of subdirectories for objects */ -__u64 lsd_catalog_oid;/* recovery catalog object id */ -__u32 lsd_catalog_ogen;/* recovery catalog inode generation */ -__u8 lsd_peeruuid[40 ];/* UUID of MDS associated with this OST */ -__u32 lsd_osd_index;/* index number of OST in LOV */ -__u32 lsd_padding1;/* was lsd_mdt_index, unused in 2.4.0 */ -__u32 lsd_start_epoch;/* VBR: start epoch from last boot */ -/** transaction values since lsd_trans_table_time */ -__u64 lsd_trans_table[LR_EXPIRE_INTERVALS ]; -/** start point of transno table below */ -__u32 lsd_trans_table_time;/* time of first slot in table above */ -__u32 lsd_expire_intervals;/* LR_EXPIRE_INTERVALS */ -__u8 lsd_padding[LR_SERVER_SIZE -288 ]; -}; - -/* Data stored per client in the last_rcvd file. In le32 order. */ -struct lsd_client_data { -__u8 lcd_uuid[40 ];/* client UUID */ -__u64 lcd_last_transno;/* last completed transaction ID */ -__u64 lcd_last_xid;/* xid for the last transaction */ -__u32 lcd_last_result;/* result from last RPC */ -__u32 lcd_last_data;/* per-op data (disposition for open &c.) */ -/* for MDS_CLOSE requests */ -__u64 lcd_last_close_transno;/* last completed transaction ID */ -__u64 lcd_last_close_xid;/* xid for the last transaction */ -__u32 lcd_last_close_result;/* result from last RPC */ -__u32 lcd_last_close_data;/* per-op data */ -/* VBR: last versions */ -__u64 lcd_pre_versions[4 ]; -__u32 lcd_last_epoch; -/** orphans handling for delayed export rely on that */ -__u32 lcd_first_epoch; -__u8 lcd_padding[LR_CLIENT_SIZE -128 ]; -}; - -/* bug20354: the lcd_uuid for export of clients may be wrong */ -static inline void check_lcd (char *obd_name,int index, -struct lsd_client_data *lcd) -{ -int length =sizeof (lcd->lcd_uuid); - -if (strnlen ((char *)lcd->lcd_uuid, length) == length) { - lcd->lcd_uuid[length -1 ] ='\0' ; - -LCONSOLE_ERROR ("the client UUID (%s) on %s for exports stored in last_rcvd(index = %d) is bad!\n" , - lcd->lcd_uuid, obd_name, index); - } -} - -/* last_rcvd handling */ -static inline void lsd_le_to_cpu (struct lr_server_data *buf, -struct lr_server_data *lsd) -{ -int i; - -memcpy (lsd->lsd_uuid, buf->lsd_uuid,sizeof (lsd->lsd_uuid)); - lsd->lsd_last_transno =le64_to_cpu (buf->lsd_last_transno); - lsd->lsd_compat14 =le64_to_cpu (buf->lsd_compat14); - lsd->lsd_mount_count =le64_to_cpu (buf->lsd_mount_count); - lsd->lsd_feature_compat =le32_to_cpu (buf->lsd_feature_compat); - lsd->lsd_feature_rocompat =le32_to_cpu (buf->lsd_feature_rocompat); - lsd->lsd_feature_incompat =le32_to_cpu (buf->lsd_feature_incompat); - lsd->lsd_server_size =le32_to_cpu (buf->lsd_server_size); - lsd->lsd_client_start =le32_to_cpu (buf->lsd_client_start); - lsd->lsd_client_size =le16_to_cpu (buf->lsd_client_size); - lsd->lsd_subdir_count =le16_to_cpu (buf->lsd_subdir_count); - lsd->lsd_catalog_oid =le64_to_cpu (buf->lsd_catalog_oid); - lsd->lsd_catalog_ogen =le32_to_cpu (buf->lsd_catalog_ogen); -memcpy (lsd->lsd_peeruuid, buf->lsd_peeruuid,sizeof (lsd->lsd_peeruuid)); - lsd->lsd_osd_index =le32_to_cpu (buf->lsd_osd_index); - lsd->lsd_padding1 =le32_to_cpu (buf->lsd_padding1); - lsd->lsd_start_epoch =le32_to_cpu (buf->lsd_start_epoch); -for (i =0 ; i <LR_EXPIRE_INTERVALS ; i++) - lsd->lsd_trans_table[i] =le64_to_cpu (buf->lsd_trans_table[i]); - lsd->lsd_trans_table_time =le32_to_cpu (buf->lsd_trans_table_time); - lsd->lsd_expire_intervals =le32_to_cpu (buf->lsd_expire_intervals); -} - -static inline void lsd_cpu_to_le (struct lr_server_data *lsd, -struct lr_server_data *buf) -{ -int i; - -memcpy (buf->lsd_uuid, lsd->lsd_uuid,sizeof (buf->lsd_uuid)); - buf->lsd_last_transno =cpu_to_le64 (lsd->lsd_last_transno); - buf->lsd_compat14 =cpu_to_le64 (lsd->lsd_compat14); - buf->lsd_mount_count =cpu_to_le64 (lsd->lsd_mount_count); - buf->lsd_feature_compat =cpu_to_le32 (lsd->lsd_feature_compat); - buf->lsd_feature_rocompat =cpu_to_le32 (lsd->lsd_feature_rocompat); - buf->lsd_feature_incompat =cpu_to_le32 (lsd->lsd_feature_incompat); - buf->lsd_server_size =cpu_to_le32 (lsd->lsd_server_size); - buf->lsd_client_start =cpu_to_le32 (lsd->lsd_client_start); - buf->lsd_client_size =cpu_to_le16 (lsd->lsd_client_size); - buf->lsd_subdir_count =cpu_to_le16 (lsd->lsd_subdir_count); - buf->lsd_catalog_oid =cpu_to_le64 (lsd->lsd_catalog_oid); - buf->lsd_catalog_ogen =cpu_to_le32 (lsd->lsd_catalog_ogen); -memcpy (buf->lsd_peeruuid, lsd->lsd_peeruuid,sizeof (buf->lsd_peeruuid)); - buf->lsd_osd_index =cpu_to_le32 (lsd->lsd_osd_index); - buf->lsd_padding1 =cpu_to_le32 (lsd->lsd_padding1); - buf->lsd_start_epoch =cpu_to_le32 (lsd->lsd_start_epoch); -for (i =0 ; i <LR_EXPIRE_INTERVALS ; i++) - buf->lsd_trans_table[i] =cpu_to_le64 (lsd->lsd_trans_table[i]); - buf->lsd_trans_table_time =cpu_to_le32 (lsd->lsd_trans_table_time); - buf->lsd_expire_intervals =cpu_to_le32 (lsd->lsd_expire_intervals); -} - -static inline void lcd_le_to_cpu (struct lsd_client_data *buf, -struct lsd_client_data *lcd) -{ -memcpy (lcd->lcd_uuid, buf->lcd_uuid,sizeof (lcd->lcd_uuid)); - lcd->lcd_last_transno =le64_to_cpu (buf->lcd_last_transno); - lcd->lcd_last_xid =le64_to_cpu (buf->lcd_last_xid); - lcd->lcd_last_result =le32_to_cpu (buf->lcd_last_result); - lcd->lcd_last_data =le32_to_cpu (buf->lcd_last_data); - lcd->lcd_last_close_transno =le64_to_cpu (buf->lcd_last_close_transno); - lcd->lcd_last_close_xid =le64_to_cpu (buf->lcd_last_close_xid); - lcd->lcd_last_close_result =le32_to_cpu (buf->lcd_last_close_result); - lcd->lcd_last_close_data =le32_to_cpu (buf->lcd_last_close_data); - lcd->lcd_pre_versions[0 ] =le64_to_cpu (buf->lcd_pre_versions[0 ]); - lcd->lcd_pre_versions[1 ] =le64_to_cpu (buf->lcd_pre_versions[1 ]); - lcd->lcd_pre_versions[2 ] =le64_to_cpu (buf->lcd_pre_versions[2 ]); - lcd->lcd_pre_versions[3 ] =le64_to_cpu (buf->lcd_pre_versions[3 ]); - lcd->lcd_last_epoch =le32_to_cpu (buf->lcd_last_epoch); - lcd->lcd_first_epoch =le32_to_cpu (buf->lcd_first_epoch); -} - -static inline void lcd_cpu_to_le (struct lsd_client_data *lcd, -struct lsd_client_data *buf) -{ -memcpy (buf->lcd_uuid, lcd->lcd_uuid,sizeof (lcd->lcd_uuid)); - buf->lcd_last_transno =cpu_to_le64 (lcd->lcd_last_transno); - buf->lcd_last_xid =cpu_to_le64 (lcd->lcd_last_xid); - buf->lcd_last_result =cpu_to_le32 (lcd->lcd_last_result); - buf->lcd_last_data =cpu_to_le32 (lcd->lcd_last_data); - buf->lcd_last_close_transno =cpu_to_le64 (lcd->lcd_last_close_transno); - buf->lcd_last_close_xid =cpu_to_le64 (lcd->lcd_last_close_xid); - buf->lcd_last_close_result =cpu_to_le32 (lcd->lcd_last_close_result); - buf->lcd_last_close_data =cpu_to_le32 (lcd->lcd_last_close_data); - buf->lcd_pre_versions[0 ] =cpu_to_le64 (lcd->lcd_pre_versions[0 ]); - buf->lcd_pre_versions[1 ] =cpu_to_le64 (lcd->lcd_pre_versions[1 ]); - buf->lcd_pre_versions[2 ] =cpu_to_le64 (lcd->lcd_pre_versions[2 ]); - buf->lcd_pre_versions[3 ] =cpu_to_le64 (lcd->lcd_pre_versions[3 ]); - buf->lcd_last_epoch =cpu_to_le32 (lcd->lcd_last_epoch); - buf->lcd_first_epoch =cpu_to_le32 (lcd->lcd_first_epoch); -} - -static inline __u64 lcd_last_transno (struct lsd_client_data *lcd) -{ -return (lcd->lcd_last_transno > lcd->lcd_last_close_transno ? - lcd->lcd_last_transno : lcd->lcd_last_close_transno); -} - -static inline __u64 lcd_last_xid (struct lsd_client_data *lcd) -{ -return (lcd->lcd_last_xid > lcd->lcd_last_close_xid ? - lcd->lcd_last_xid : lcd->lcd_last_close_xid); -} -/****************** superblock additional info *********************/ struct ll_sb_info ;
Signature · 1 line
2.1.0
PATCH 38/56 staging/lustre: Remove dead code in ldlm_lock_destroy_internal
In reply to [email protected]From: Oleg Drokin <[email protected]>
This code has been commented out since end of 2012, so it's clearly not needed here.
--- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +0 -10
@@ -337,16 +337,6 @@ static int ldlm_lock_destroy_internal(struct ldlm_lock *lock)ldlm_lock_remove_from_lru (lock);class_handle_unhash (&lock->l_handle); -#if 0 -/* Wake anyone waiting for this lock */ -/* FIXME: I should probably add yet another flag, instead of using -* l_export to only call this on clients */ -if (lock->l_export) -class_export_put (lock->l_export); - lock->l_export =NULL ; -if (lock->l_export && lock->l_completion_ast) - lock->l_completion_ast (lock,0 ); -#endif return 1 ; }
Signature · 1 line
2.1.0
PATCH 39/56 staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it.
In reply to [email protected]From: Oleg Drokin <[email protected]>
--- drivers/staging/lustre/lustre/llite/file.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/lustre/lustre/llite/file.c +0 -2
@@ -3071,10 +3071,8 @@ int ll_inode_permission(struct inode *inode, int mask) {int rc =0 ; -#ifdef MAY_NOT_BLOCK if (mask &MAY_NOT_BLOCK )return -ECHILD ; -#endif /* as root inode are NOT getting validated in lookup operation, * need to do it before permission check. */
Signature · 1 line
2.1.0
PATCH 40/56 staging/lustre: Remove unused lli_open_count from struct ll_inode_info
In reply to [email protected]From: Oleg Drokin <[email protected]>
Capabilities code was the only user and it is long gone.
--- drivers/staging/lustre/lustre/llite/llite_internal.h | 6 ++---- drivers/staging/lustre/lustre/llite/llite_lib.c | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/staging/lustre/lustre/llite/llite_internal.h +2 -4
@@ -133,10 +133,8 @@ struct ll_inode_info {* for allocating OST objects after a mknod() and later open-by-FID. */ struct lu_fid lli_pfid; -struct list_head lli_close_list; -/* open count currently used by capability only, indicate whether -* capability needs renewal */ -atomic_t lli_open_count; +struct list_head lli_close_list; +unsigned long lli_rmtperm_time;/* handle is to be sent to MDS later on done_writing and setattr.
drivers/staging/lustre/lustre/llite/llite_lib.c +0 -1
@@ -797,7 +797,6 @@ void ll_lli_init(struct ll_inode_info *lli)/* Do not set lli_fid, it has been initialized already. */ fid_zero (&lli->lli_pfid);INIT_LIST_HEAD (&lli->lli_close_list); -atomic_set (&lli->lli_open_count,0 ); lli->lli_rmtperm_time =0 ; lli->lli_pending_och =NULL ; lli->lli_mds_read_och =NULL ;
Signature · 1 line
2.1.0
PATCH 41/56 staging/lustre: Reformat comments and structures in lustre_idl.h
In reply to [email protected]From: Oleg Drokin <[email protected]>
This file mostly contains various on the wire data and got significantly mangled in transition.
This patch rectifies the situation somewhat. Also fixes the comment style for block comments.
--- .../lustre/lustre/include/lustre/lustre_idl.h | 286 ++++++++++++--------- 1 file changed, 165 insertions(+), 121 deletions(-)
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +165 -121
@@ -146,7 +146,9 @@#define SEQ_CONTROLLER_PORTAL 32#define MGS_BULK_PORTAL 33 -/* Portal 63 is reserved for the Cray Inc DVS - nic at cray.com, roe at cray.com, n8851 at cray.com */ +/* Portal 63 is reserved for the Cray Inc DVS - nic at cray.com, roe at cray.com, +* n8851 at cray.com +*/ /* packet types */ #define PTL_RPC_MSG_REQUEST 4711
@@ -295,7 +297,8 @@ static inline int range_compare_loc(const struct lu_seq_range *r1,fld_range_is_mdt (range) ?"mdt" :"ost" /** \defgroup lu_fid lu_fid -* @{ */ +* @{ +*/ /** * Flags for lustre_mdt_attrs::lma_compat and lustre_mdt_attrs::lma_incompat.
@@ -307,7 +310,8 @@ enum lma_compat {LMAC_SOM =0x00000002 ,LMAC_NOT_IN_OI =0x00000004 ,/* the object does NOT need OI mapping */ LMAC_FID_ON_OST = 0x00000008, /* For OST-object, its OI mapping is - * under /O/<seq>/d<x>. */ + * under /O/<seq>/d<x>. + */ };/**
@@ -319,7 +323,8 @@ enum lma_incompat {LMAI_RELEASED =0x00000001 ,/* file is released */ LMAI_AGENT =0x00000002 ,/* agent inode */ LMAI_REMOTE_PARENT = 0x00000004, /* the parent of the object - is on the remote MDT */ + * is on the remote MDT + */ };#define LMA_INCOMPAT_SUPP (LMAI_AGENT | LMAI_REMOTE_PARENT)
@@ -395,12 +400,14 @@ enum fid_seq {FID_SEQ_LOCAL_FILE =0x200000001ULL ,FID_SEQ_DOT_LUSTRE =0x200000002ULL ,/* sequence is used for local named objects FIDs generated -* by local_object_storage library */ +* by local_object_storage library +*/ FID_SEQ_LOCAL_NAME =0x200000003ULL ,/* Because current FLD will only cache the fid sequence, instead * of oid on the client side, if the FID needs to be exposed to * clients sides, it needs to make sure all of fids under one -* sequence will be located in one MDT. */ +* sequence will be located in one MDT. +*/ FID_SEQ_SPECIAL =0x200000004ULL ,FID_SEQ_QUOTA =0x200000005ULL , FID_SEQ_QUOTA_GLB = 0x200000006ULL,
@@ -601,7 +608,8 @@ static inline void ostid_set_seq(struct ost_id *oi, __u64 seq) oi->oi_fid.f_seq = seq;/* Note: if f_oid + f_ver is zero, we need init it * to be 1, otherwise, ostid_seq will treat this -* as old ostid (oi_seq == 0) */ +* as old ostid (oi_seq == 0) +*/ if (oi->oi_fid.f_oid ==0 && oi->oi_fid.f_ver ==0 ) oi->oi_fid.f_oid =LUSTRE_FID_INIT_OID ; }
@@ -689,7 +697,8 @@ static inline int ostid_to_fid(struct lu_fid *fid, struct ost_id *ostid,* that we map into the IDIF namespace. It allows up to 2^48 * objects per OST, as this is the object namespace that has * been in production for years. This can handle create rates -* of 1M objects/s/OST for 9 years, or combinations thereof. */ +* of 1M objects/s/OST for 9 years, or combinations thereof. +*/ if (ostid_id (ostid) >=IDIF_MAX_OID ) {CERROR ("bad MDT0 id, " DOSTID " ost_idx:%u\n" ,POSTID (ostid), ost_idx);
@@ -704,7 +713,8 @@ static inline int ostid_to_fid(struct lu_fid *fid, struct ost_id *ostid,/* This is either an IDIF object, which identifies objects across * all OSTs, or a regular FID. The IDIF namespace maps legacy * OST objects into the FID namespace. In both cases, we just -* pass the FID through, no conversion needed. */ +* pass the FID through, no conversion needed. +*/ if (ostid->oi_fid.f_ver !=0 ) {CERROR ("bad MDT0 id, " DOSTID " ost_idx:%u\n" ,POSTID (ostid), ost_idx);
@@ -868,7 +878,8 @@ static inline void ostid_le_to_cpu(const struct ost_id *src_oi,/** @} lu_fid */ /** \defgroup lu_dir lu_dir -* @{ */ +* @{ +*/ /** * Enumeration of possible directory entry attributes.
@@ -1112,7 +1123,8 @@ struct ptlrpc_body_v2 {__u32 pb_conn_cnt;__u32 pb_timeout;/* for req, the deadline, for rep, the service est */ __u32 pb_service_time;/* for rep, actual service time, also used for -net_latency of req */ +* net_latency of req +*/ __u32 pb_limit;__u64 pb_slv;/* VBR: pre-versions */
@@ -1158,7 +1170,8 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);/* #define MSG_AT_SUPPORT 0x0008 * This was used in early prototypes of adaptive timeouts, and while there * shouldn't be any users of that code there also isn't a need for using this -* bits. Defer usage until at least 1.10 to avoid potential conflict. */ +* bits. Defer usage until at least 1.10 to avoid potential conflict. +*/ #define MSG_DELAY_REPLAY 0x0010#define MSG_VERSION_REPLAY 0x0020#define MSG_REQ_REPLAY_DONE 0x0040
@@ -1179,60 +1192,65 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);#define MSG_CONNECT_TRANSNO 0x00000100/* report transno */ /* Connect flags */ -#define OBD_CONNECT_RDONLY 0x1ULL/*client has read-only access*/ -#define OBD_CONNECT_INDEX 0x2ULL/*connect specific LOV idx */ -#define OBD_CONNECT_MDS 0x4ULL/*connect from MDT to OST */ -#define OBD_CONNECT_GRANT 0x8ULL/*OSC gets grant at connect */ -#define OBD_CONNECT_SRVLOCK 0x10ULL/*server takes locks for cli */ -#define OBD_CONNECT_VERSION 0x20ULL/*Lustre versions in ocd */ -#define OBD_CONNECT_REQPORTAL 0x40ULL/*Separate non-IO req portal */ -#define OBD_CONNECT_ACL 0x80ULL/*access control lists */ -#define OBD_CONNECT_XATTR 0x100ULL/*client use extended attr */ +#define OBD_CONNECT_RDONLY 0x1ULL/*client has read-only access*/ +#define OBD_CONNECT_INDEX 0x2ULL/*connect specific LOV idx */ +#define OBD_CONNECT_MDS 0x4ULL/*connect from MDT to OST */ +#define OBD_CONNECT_GRANT 0x8ULL/*OSC gets grant at connect */ +#define OBD_CONNECT_SRVLOCK 0x10ULL/*server takes locks for cli */ +#define OBD_CONNECT_VERSION 0x20ULL/*Lustre versions in ocd */ +#define OBD_CONNECT_REQPORTAL 0x40ULL/*Separate non-IO req portal */ +#define OBD_CONNECT_ACL 0x80ULL/*access control lists */ +#define OBD_CONNECT_XATTR 0x100ULL/*client use extended attr */ #define OBD_CONNECT_CROW 0x200ULL/*MDS+OST create obj on write*/ -#define OBD_CONNECT_TRUNCLOCK 0x400ULL/*locks on server for punch */ -#define OBD_CONNECT_TRANSNO 0x800ULL/*replay sends init transno */ -#define OBD_CONNECT_IBITS 0x1000ULL/*support for inodebits locks*/ +#define OBD_CONNECT_TRUNCLOCK 0x400ULL/*locks on server for punch */ +#define OBD_CONNECT_TRANSNO 0x800ULL/*replay sends init transno */ +#define OBD_CONNECT_IBITS 0x1000ULL/*support for inodebits locks*/ #define OBD_CONNECT_JOIN 0x2000ULL/*files can be concatenated. *We do not support JOIN FILE *anymore, reserve this flags *just for preventing such bit -*to be reused.*/ -#define OBD_CONNECT_ATTRFID 0x4000ULL/*Server can GetAttr By Fid*/ -#define OBD_CONNECT_NODEVOH 0x8000ULL/*No open hndl on specl nodes*/ -#define OBD_CONNECT_RMT_CLIENT 0x10000ULL/*Remote client */ +*to be reused. +*/ +#define OBD_CONNECT_ATTRFID 0x4000ULL/*Server can GetAttr By Fid*/ +#define OBD_CONNECT_NODEVOH 0x8000ULL/*No open hndl on specl nodes*/ +#define OBD_CONNECT_RMT_CLIENT 0x10000ULL/*Remote client */ #define OBD_CONNECT_RMT_CLIENT_FORCE 0x20000ULL/*Remote client by force */ -#define OBD_CONNECT_BRW_SIZE 0x40000ULL/*Max bytes per rpc */ -#define OBD_CONNECT_QUOTA64 0x80000ULL/*Not used since 2.4 */ -#define OBD_CONNECT_MDS_CAPA 0x100000ULL/*MDS capability */ -#define OBD_CONNECT_OSS_CAPA 0x200000ULL/*OSS capability */ -#define OBD_CONNECT_CANCELSET 0x400000ULL/*Early batched cancels. */ -#define OBD_CONNECT_SOM 0x800000ULL/*Size on MDS */ -#define OBD_CONNECT_AT 0x1000000ULL/*client uses AT */ +#define OBD_CONNECT_BRW_SIZE 0x40000ULL/*Max bytes per rpc */ +#define OBD_CONNECT_QUOTA64 0x80000ULL/*Not used since 2.4 */ +#define OBD_CONNECT_MDS_CAPA 0x100000ULL/*MDS capability */ +#define OBD_CONNECT_OSS_CAPA 0x200000ULL/*OSS capability */ +#define OBD_CONNECT_CANCELSET 0x400000ULL/*Early batched cancels. */ +#define OBD_CONNECT_SOM 0x800000ULL/*Size on MDS */ +#define OBD_CONNECT_AT 0x1000000ULL/*client uses AT */ #define OBD_CONNECT_LRU_RESIZE 0x2000000ULL/*LRU resize feature. */ -#define OBD_CONNECT_MDS_MDS 0x4000000ULL/*MDS-MDS connection */ +#define OBD_CONNECT_MDS_MDS 0x4000000ULL/*MDS-MDS connection */ #define OBD_CONNECT_REAL 0x8000000ULL/*real connection */ #define OBD_CONNECT_CHANGE_QS 0x10000000ULL/*Not used since 2.4 */ -#define OBD_CONNECT_CKSUM 0x20000000ULL/*support several cksum algos*/ -#define OBD_CONNECT_FID 0x40000000ULL/*FID is supported by server */ -#define OBD_CONNECT_VBR 0x80000000ULL/*version based recovery */ -#define OBD_CONNECT_LOV_V3 0x100000000ULL/*client supports LOV v3 EA */ +#define OBD_CONNECT_CKSUM 0x20000000ULL/*support several cksum algos*/ +#define OBD_CONNECT_FID 0x40000000ULL/*FID is supported by server */ +#define OBD_CONNECT_VBR 0x80000000ULL/*version based recovery */ +#define OBD_CONNECT_LOV_V3 0x100000000ULL/*client supports LOV v3 EA */ #define OBD_CONNECT_GRANT_SHRINK 0x200000000ULL/* support grant shrink */ #define OBD_CONNECT_SKIP_ORPHAN 0x400000000ULL/* don't reuse orphan objids */ #define OBD_CONNECT_MAX_EASIZE 0x800000000ULL/* preserved for large EA */ #define OBD_CONNECT_FULL20 0x1000000000ULL/* it is 2.0 client */ #define OBD_CONNECT_LAYOUTLOCK 0x2000000000ULL/* client uses layout lock */ #define OBD_CONNECT_64BITHASH 0x4000000000ULL/* client supports 64-bits -* directory hash */ +* directory hash +*/ #define OBD_CONNECT_MAXBYTES 0x8000000000ULL/* max stripe size */ #define OBD_CONNECT_IMP_RECOV 0x10000000000ULL/* imp recovery support */ #define OBD_CONNECT_JOBSTATS 0x20000000000ULL/* jobid in ptlrpc_body */ #define OBD_CONNECT_UMASK 0x40000000000ULL/* create uses client umask */ #define OBD_CONNECT_EINPROGRESS 0x80000000000ULL/* client handles -EINPROGRESS -* RPC error properly */ +* RPC error properly +*/ #define OBD_CONNECT_GRANT_PARAM 0x100000000000ULL/* extra grant params used for -* finer space reservation */ +* finer space reservation +*/ #define OBD_CONNECT_FLOCK_OWNER 0x200000000000ULL/* for the fixed 1.8 -* policy and 2.x server */ +* policy and 2.x server +*/ #define OBD_CONNECT_LVB_TYPE 0x400000000000ULL/* variable type of LVB */ #define OBD_CONNECT_NANOSEC_TIME 0x800000000000ULL/* nanosecond timestamps */ #define OBD_CONNECT_LIGHTWEIGHT 0x1000000000000ULL/* lightweight connection */
@@ -1276,7 +1294,8 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);/* This structure is used for both request and reply. * * If we eventually have separate connect data for different types, which we -* almost certainly will, then perhaps we stick a union in here. */ +* almost certainly will, then perhaps we stick a union in here. +*/ struct obd_connect_data_v1 {__u64 ocd_connect_flags;/* OBD_CONNECT_* per above */ __u32 ocd_version;/* lustre release version number */
@@ -1306,7 +1325,7 @@ struct obd_connect_data {__u8 ocd_blocksize;/* log2 of the backend filesystem blocksize */ __u8 ocd_inodespace;/* log2 of the per-inode space consumption */ __u16 ocd_grant_extent;/* per-extent grant overhead, in 1K blocks */ -__u32 ocd_unused;/* also fix lustre_swab_connect */ +__u32 ocd_unused;/* also fix lustre_swab_connect */ __u64 ocd_transno;/* first transno from client to be replayed */ __u32 ocd_group;/* MDS group on OST */ __u32 ocd_cksum_types;/* supported checksum algorithms */
@@ -1316,7 +1335,8 @@ struct obd_connect_data {/* Fields after ocd_maxbytes are only accessible by the receiver * if the corresponding flag in ocd_connect_flags is set. Accessing * any field after ocd_maxbytes on the receiver without a valid flag -* may result in out-of-bound memory access and kernel oops. */ +* may result in out-of-bound memory access and kernel oops. +*/ __u64 padding1;/* added 2.1.0. also fix lustre_swab_connect */ __u64 padding2;/* added 2.1.0. also fix lustre_swab_connect */ __u64 padding3;/* added 2.1.0. also fix lustre_swab_connect */
@@ -1340,7 +1360,8 @@ struct obd_connect_data {* with senior engineers before starting to use a new field. Then, submit * a small patch against EVERY branch that ONLY adds the new field along with * the matching OBD_CONNECT flag, so that can be approved and landed easily to -* reserve the flag for future use. */ +* reserve the flag for future use. +*/ void lustre_swab_connect (struct obd_connect_data *ocd);
@@ -1389,7 +1410,7 @@ enum obdo_flags {OBD_FL_INLINEDATA =0x00000001 ,OBD_FL_OBDMDEXISTS =0x00000002 ,OBD_FL_DELORPHAN =0x00000004 ,/* if set in o_flags delete orphans */ -OBD_FL_NORPC =0x00000008 ,/* set in o_flags do in OSC not OST */ +OBD_FL_NORPC =0x00000008 ,/* set in o_flags do in OSC not OST */ OBD_FL_IDONLY =0x00000010 ,/* set in o_flags only adjust obj id*/ OBD_FL_RECREATE_OBJS =0x00000020 ,/* recreate missing obj */ OBD_FL_DEBUG_CHECK = 0x00000040, /* echo client/server debug check */
@@ -1403,14 +1424,16 @@ enum obdo_flags {OBD_FL_CKSUM_RSVD2 =0x00008000 ,/* for future cksum types */ OBD_FL_CKSUM_RSVD3 =0x00010000 ,/* for future cksum types */ OBD_FL_SHRINK_GRANT =0x00020000 ,/* object shrink the grant */ -OBD_FL_MMAP =0x00040000 ,/* object is mmapped on the client. +OBD_FL_MMAP =0x00040000 ,/* object is mmapped on the client. * XXX: obsoleted - reserved for old -* clients prior than 2.2 */ +* clients prior than 2.2 +*/ OBD_FL_RECOV_RESEND =0x00080000 ,/* recoverable resent */ OBD_FL_NOSPC_BLK =0x00100000 ,/* no more block space on OST */ /* Note that while these checksum values are currently separate bits, -* in 2.x we can actually allow all values from 1-31 if we wanted. */ +* in 2.x we can actually allow all values from 1-31 if we wanted. +*/ OBD_FL_CKSUM_ALL =OBD_FL_CKSUM_CRC32 |OBD_FL_CKSUM_ADLER | OBD_FL_CKSUM_CRC32C,
@@ -1599,7 +1622,7 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic) } } -#define OBD_MD_FLID (0x00000001ULL)/* object ID */ +#define OBD_MD_FLID (0x00000001ULL)/* object ID */ #define OBD_MD_FLATIME (0x00000002ULL)/* access time */ #define OBD_MD_FLMTIME (0x00000004ULL)/* data modification time */ #define OBD_MD_FLCTIME (0x00000008ULL)/* change time */
@@ -1625,22 +1648,23 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)#define OBD_MD_FLGROUP (0x01000000ULL)/* group */ #define OBD_MD_FLFID (0x02000000ULL)/* ->ost write inline fid */ #define OBD_MD_FLEPOCH (0x04000000ULL)/* ->ost write with ioepoch */ -/* ->mds if epoch opens or closes */ +/* ->mds if epoch opens or closes +*/ #define OBD_MD_FLGRANT (0x08000000ULL)/* ost preallocation space grant */ #define OBD_MD_FLDIREA (0x10000000ULL)/* dir's extended attribute data */ #define OBD_MD_FLUSRQUOTA (0x20000000ULL)/* over quota flags sent from ost */ #define OBD_MD_FLGRPQUOTA (0x40000000ULL)/* over quota flags sent from ost */ #define OBD_MD_FLMODEASIZE (0x80000000ULL)/* EA size will be changed */ -#define OBD_MD_MDS (0x0000000100000000ULL)/* where an inode lives on */ +#define OBD_MD_MDS (0x0000000100000000ULL)/* where an inode lives on */ #define OBD_MD_REINT (0x0000000200000000ULL)/* reintegrate oa */ -#define OBD_MD_MEA (0x0000000400000000ULL)/* CMD split EA */ +#define OBD_MD_MEA (0x0000000400000000ULL)/* CMD split EA */ #define OBD_MD_TSTATE (0x0000000800000000ULL)/* transient state field */ #define OBD_MD_FLXATTR (0x0000001000000000ULL)/* xattr */ #define OBD_MD_FLXATTRLS (0x0000002000000000ULL)/* xattr list */ #define OBD_MD_FLXATTRRM (0x0000004000000000ULL)/* xattr remove */ -#define OBD_MD_FLACL (0x0000008000000000ULL)/* ACL */ +#define OBD_MD_FLACL (0x0000008000000000ULL)/* ACL */ #define OBD_MD_FLRMTPERM (0x0000010000000000ULL)/* remote permission */ #define OBD_MD_FLMDSCAPA (0x0000020000000000ULL)/* MDS capability */ #define OBD_MD_FLOSSCAPA (0x0000040000000000ULL)/* OSS capability */
@@ -1649,7 +1673,8 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)#define OBD_MD_FLGETATTRLOCK (0x0000200000000000ULL)/* Get IOEpoch attributes * under lock; for xattr * requests means the -* client holds the lock */ +* client holds the lock +*/ #define OBD_MD_FLOBJCOUNT (0x0000400000000000ULL)/* for multiple destroy */ #define OBD_MD_FLRMTLSETFACL (0x0001000000000000ULL)/* lfs lsetfacl case */
@@ -1669,7 +1694,8 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)#define OBD_MD_FLXATTRALL (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS)/* don't forget obdo_fid which is way down at the bottom so it can -* come after the definition of llog_cookie */ +* come after the definition of llog_cookie +*/ enum hss_valid {HSS_SETMASK =0x01 ,
@@ -1691,19 +1717,20 @@ void lustre_swab_obd_statfs(struct obd_statfs *os);/* ost_body.data values for OST_BRW */ -#define OBD_BRW_READ 0x01 -#define OBD_BRW_WRITE 0x02 -#define OBD_BRW_RWMASK (OBD_BRW_READ | OBD_BRW_WRITE) -#define OBD_BRW_SYNC 0x08/* this page is a part of synchronous +#define OBD_BRW_READ 0x01 +#define OBD_BRW_WRITE 0x02 +#define OBD_BRW_RWMASK (OBD_BRW_READ | OBD_BRW_WRITE) +#define OBD_BRW_SYNC 0x08/* this page is a part of synchronous * transfer and is not accounted in -* the grant. */ -#define OBD_BRW_CHECK 0x10 +* the grant. +*/ +#define OBD_BRW_CHECK 0x10#define OBD_BRW_FROM_GRANT 0x20/* the osc manages this under llite */ -#define OBD_BRW_GRANTED 0x40/* the ost manages this */ -#define OBD_BRW_NOCACHE 0x80/* this page is a part of non-cached IO */ -#define OBD_BRW_NOQUOTA 0x100 -#define OBD_BRW_SRVLOCK 0x200/* Client holds no lock over this page */ -#define OBD_BRW_ASYNC 0x400/* Server may delay commit to disk */ +#define OBD_BRW_GRANTED 0x40/* the ost manages this */ +#define OBD_BRW_NOCACHE 0x80/* this page is a part of non-cached IO */ +#define OBD_BRW_NOQUOTA 0x100 +#define OBD_BRW_SRVLOCK 0x200/* Client holds no lock over this page */ +#define OBD_BRW_ASYNC 0x400/* Server may delay commit to disk */ #define OBD_BRW_MEMALLOC 0x800/* Client runs in the "kswapd" context */ #define OBD_BRW_OVER_USRQUOTA 0x1000/* Running out of user quota */ #define OBD_BRW_OVER_GRPQUOTA 0x2000/* Running out of group quota */
@@ -1717,7 +1744,8 @@ struct obd_ioobj {struct ost_id ioo_oid;/* object ID, if multi-obj BRW */ __u32 ioo_max_brw;/* low 16 bits were o_mode before 2.4, * now (PTLRPC_BULK_OPS_COUNT - 1) in -* high 16 bits in 2.4 and later */ +* high 16 bits in 2.4 and later +*/ __u32 ioo_bufcnt;/* number of niobufs for this object */ };
@@ -1741,7 +1769,8 @@ void lustre_swab_niobuf_remote(struct niobuf_remote *nbr);/* lock value block communicated between the filter and llite */ /* OST_LVB_ERR_INIT is needed because the return code in rc is -* negative, i.e. because ((MASK + rc) & MASK) != MASK. */ +* negative, i.e. because ((MASK + rc) & MASK) != MASK. +*/ #define OST_LVB_ERR_INIT 0xffbadbad80000000ULL#define OST_LVB_ERR_MASK 0xffbadbad00000000ULL#define OST_LVB_IS_ERR (blocks) \
@@ -1782,7 +1811,8 @@ void lustre_swab_ost_lvb(struct ost_lvb *lvb);* can be used with quota, this includes: * - 64-bit user ID * - 64-bit group ID -* - a FID which can be used for per-directory quota in the future */ +* - a FID which can be used for per-directory quota in the future +*/ union lquota_id {struct lu_fid qid_fid;/* FID for per-directory quota */ __u64 qid_uid;/* user identifier */
@@ -1832,9 +1862,6 @@ struct ldlm_gl_lquota_desc {__u64 gl_pad2; }; -#define gl_qunit gl_hardlimit/* current qunit value used when -* glimpsing per-ID quota locks */ -/* quota glimpse flags */ #define LQUOTA_FL_EDQUOT 0x1/* user/group out of quota space on QMT */
@@ -1849,9 +1876,6 @@ struct lquota_lvb {void lustre_swab_lquota_lvb (struct lquota_lvb *lvb); -/* LVB used with global quota lock */ -#define lvb_glb_ver lvb_id_may_rel/* current version of the global index */ -/* op codes */ enum quota_cmd {QUOTA_DQACQ =601 ,
@@ -1936,7 +1960,8 @@ void lustre_swab_generic_32s(__u32 *val);/* INODE LOCK PARTS */ #define MDS_INODELOCK_LOOKUP 0x000001/* For namespace, dentry etc, and also * was used to protect permission (mode, -* owner, group etc) before 2.4. */ +* owner, group etc) before 2.4. +*/ #define MDS_INODELOCK_UPDATE 0x000002/* size, links, timestamps */ #define MDS_INODELOCK_OPEN 0x000004/* For opened files */ #define MDS_INODELOCK_LAYOUT 0x000008/* for layout */
@@ -1949,7 +1974,8 @@ void lustre_swab_generic_32s(__u32 *val);* For local directory, MDT will always grant UPDATE_LOCK|PERM_LOCK together. * For Remote directory, the master MDT, where the remote directory is, will * grant UPDATE_LOCK|PERM_LOCK, and the remote MDT, where the name entry is, -* will grant LOOKUP_LOCK. */ +* will grant LOOKUP_LOCK. +*/ #define MDS_INODELOCK_PERM 0x000010#define MDS_INODELOCK_XATTR 0x000020/* extended attributes */
@@ -1959,7 +1985,8 @@ void lustre_swab_generic_32s(__u32 *val);/* NOTE: until Lustre 1.8.7/2.1.1 the fid_ver() was packed into name[2], * but was moved into name[1] along with the OID to avoid consuming the -* name[2,3] fields that need to be used for the quota id (also a FID). */ +* name[2,3] fields that need to be used for the quota id (also a FID). +*/ enum {LUSTRE_RES_ID_SEQ_OFF =0 ,LUSTRE_RES_ID_VER_OID_OFF =1 ,
@@ -1995,7 +2022,8 @@ enum md_op_flags {#define LUSTRE_BFLAG_UNCOMMITTED_WRITES 0x1/* these should be identical to their EXT4_*_FL counterparts, they are -* redefined here only to avoid dragging in fs/ext4/ext4.h */ +* redefined here only to avoid dragging in fs/ext4/ext4.h +*/ #define LUSTRE_SYNC_FL 0x00000008/* Synchronous updates */ #define LUSTRE_IMMUTABLE_FL 0x00000010/* Immutable file */ #define LUSTRE_APPEND_FL 0x00000020/* writes to file may only append */
@@ -2007,7 +2035,8 @@ enum md_op_flags {* protocol equivalents of LDISKFS_*_FL values stored on disk, while * the S_* flags are kernel-internal values that change between kernel * versions. These flags are set/cleared via FSFILT_IOC_{GET,SET}_FLAGS. -* See b=16526 for a full history. */ +* See b=16526 for a full history. +*/ static inline int ll_ext_to_inode_flags (int flags) { return (((flags & LUSTRE_SYNC_FL) ? S_SYNC : 0) |
@@ -2042,9 +2071,10 @@ struct mdt_body {__s64 ctime;__u64 blocks;/* XID, in the case of MDS_READPAGE */ __u64 ioepoch; -__u64 t_state;/* transient file state defined in -* enum md_transient_state -* was "ino" until 2.4.0 */ +__u64 t_state;/* transient file state defined in +* enum md_transient_state +* was "ino" until 2.4.0 +*/ __u32 fsuid;__u32 fsgid;__u32 capability;
@@ -2054,7 +2084,7 @@ struct mdt_body {__u32 flags;/* from vfs for pin/unpin, LUSTRE_BFLAG close */ __u32 rdev;__u32 nlink;/* #bytes to read in the case of MDS_READPAGE */ -__u32 unused2;/* was "generation" until 2.4.0 */ +__u32 unused2;/* was "generation" until 2.4.0 */ __u32 suppgid;__u32 eadatasize;__u32 aclsize;
@@ -2091,7 +2121,8 @@ enum { };/* inode access permission for remote user, the inode info are omitted, -* for client knows them. */ +* for client knows them. +*/ struct mdt_remote_perm {__u32 rp_uid;__u32 rp_gid;
@@ -2141,13 +2172,13 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);* since the client and MDS may run different kernels (see bug 13828) * Therefore, we should only use MDS_ATTR_* attributes for sa_valid. */ -#define MDS_ATTR_MODE 0x1ULL/* = 1 */ -#define MDS_ATTR_UID 0x2ULL/* = 2 */ -#define MDS_ATTR_GID 0x4ULL/* = 4 */ -#define MDS_ATTR_SIZE 0x8ULL/* = 8 */ -#define MDS_ATTR_ATIME 0x10ULL/* = 16 */ -#define MDS_ATTR_MTIME 0x20ULL/* = 32 */ -#define MDS_ATTR_CTIME 0x40ULL/* = 64 */ +#define MDS_ATTR_MODE 0x1ULL/* = 1 */ +#define MDS_ATTR_UID 0x2ULL/* = 2 */ +#define MDS_ATTR_GID 0x4ULL/* = 4 */ +#define MDS_ATTR_SIZE 0x8ULL/* = 8 */ +#define MDS_ATTR_ATIME 0x10ULL/* = 16 */ +#define MDS_ATTR_MTIME 0x20ULL/* = 32 */ +#define MDS_ATTR_CTIME 0x40ULL/* = 64 */ #define MDS_ATTR_ATIME_SET 0x80ULL/* = 128 */ #define MDS_ATTR_MTIME_SET 0x100ULL/* = 256 */ #define MDS_ATTR_FORCE 0x200ULL/* = 512, Not a change, but a change it */
@@ -2155,7 +2186,9 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);#define MDS_ATTR_KILL_SUID 0x800ULL/* = 2048 */ #define MDS_ATTR_KILL_SGID 0x1000ULL/* = 4096 */ #define MDS_ATTR_CTIME_SET 0x2000ULL/* = 8192 */ -#define MDS_ATTR_FROM_OPEN 0x4000ULL/* = 16384, called from open path, ie O_TRUNC */ +#define MDS_ATTR_FROM_OPEN 0x4000ULL/* = 16384, called from open path, +* ie O_TRUNC +*/ #define MDS_ATTR_BLOCKS 0x8000ULL/* = 32768 */ #define MDS_FMODE_CLOSED 00000000
@@ -2184,9 +2217,10 @@ void lustre_swab_mdt_rec_setattr(struct mdt_rec_setattr *sa);* We do not support JOIN FILE * anymore, reserve this flags * just for preventing such bit -* to be reused. */ +* to be reused. +*/ -#define MDS_OPEN_LOCK 04000000000/* This open requires open lock */ +#define MDS_OPEN_LOCK 04000000000/* This open requires open lock */ #define MDS_OPEN_HAS_EA 010000000000/* specify object create pattern */ #define MDS_OPEN_HAS_OBJS 020000000000/* Just set the EA the obj exist */ #define MDS_OPEN_NORESTORE 0100000000000ULL/* Do not restore file at open */
@@ -2239,7 +2273,8 @@ struct mdt_rec_create {__u32 cr_bias;/* use of helpers set/get_mrc_cr_flags() is needed to access * 64 bits cr_flags [cr_flags_l, cr_flags_h], this is done to -* extend cr_flags size without breaking 1.8 compat */ +* extend cr_flags size without breaking 1.8 compat +*/ __u32 cr_flags_l;/* for use with open, low 32 bits */ __u32 cr_flags_h;/* for use with open, high 32 bits */ __u32 cr_umask;/* umask for create */
@@ -2460,7 +2495,8 @@ enum seq_op {#define LOV_MAX_UUID_BUFFER_SIZE 8192/* The size of the buffer the lov/mdc reserves for the * array of UUIDs returned by the MDS. With the current -* protocol, this will limit the max number of OSTs per LOV */ +* protocol, this will limit the max number of OSTs per LOV +*/ #define LOV_DESC_MAGIC 0xB0CCDE5C#define LOV_DESC_QOS_MAXAGE_DEFAULT 5/* Seconds */
@@ -2469,13 +2505,13 @@ enum seq_op {/* LOV settings descriptor (should only contain static info) */ struct lov_desc {__u32 ld_tgt_count;/* how many OBD's */ -__u32 ld_active_tgt_count;/* how many active */ -__u32 ld_default_stripe_count;/* how many objects are used */ -__u32 ld_pattern;/* default PATTERN_RAID0 */ -__u64 ld_default_stripe_size;/* in bytes */ -__u64 ld_default_stripe_offset;/* in bytes */ +__u32 ld_active_tgt_count;/* how many active */ +__u32 ld_default_stripe_count;/* how many objects are used */ +__u32 ld_pattern;/* default PATTERN_RAID0 */ +__u64 ld_default_stripe_size;/* in bytes */ +__u64 ld_default_stripe_offset;/* in bytes */ __u32 ld_padding_0;/* unused */ -__u32 ld_qos_maxage;/* in second */ +__u32 ld_qos_maxage;/* in second */ __u32 ld_padding_1;/* also fix lustre_swab_lov_desc */ __u32 ld_padding_2;/* also fix lustre_swab_lov_desc */ struct obd_uuid ld_uuid;
@@ -2577,7 +2613,8 @@ struct ldlm_flock_wire {* the first fields of the ldlm_flock structure because there is only * one ldlm_swab routine to process the ldlm_policy_data_t union. if * this ever changes we will need to swab the union differently based -* on the resource type. */ +* on the resource type. +*/ typedef union { struct ldlm_extent l_extent;
@@ -2623,7 +2660,8 @@ struct ldlm_request {void lustre_swab_ldlm_request (struct ldlm_request *rq);/* If LDLM_ENQUEUE, 1 slot is already occupied, 1 is available. -* Otherwise, 2 are available. */ +* Otherwise, 2 are available. +*/ #define ldlm_request_bufsize (count, type) \ ({ \ int _avail = LDLM_LOCKREQ_HANDLES; \
@@ -2942,14 +2980,15 @@ struct llog_agent_req_rec {struct llog_rec_hdr arr_hdr;/**< record header */ __u32 arr_status;/**< status of the request */ /* must match enum -* agent_req_status */ +* agent_req_status +*/ __u32 arr_archive_id;/**< backend archive number */ __u64 arr_flags;/**< req flags */ -__u64 arr_compound_id;/**< compound cookie */ +__u64 arr_compound_id;/**< compound cookie */ __u64 arr_req_create;/**< req. creation time */ __u64 arr_req_change;/**< req. status change time */ struct hsm_action_item arr_hai;/**< req. to the agent */ -struct llog_rec_tail arr_tail;/**< record tail for_sizezof_only */ +struct llog_rec_tail arr_tail;/**< record tail for_sizezof_only */ } __packed;/* Old llog gen for compatibility */
@@ -3000,7 +3039,9 @@ struct llog_log_hdr { llh->llh_bitmap_offset - \ sizeof(llh->llh_tail)) * 8) -/** log cookies are used to reference a specific log file and a record therein */ +/** log cookies are used to reference a specific log file and a record +* therein +*/ struct llog_cookie {struct llog_logid lgc_lgl;__u32 lgc_subsys;
@@ -3015,7 +3056,7 @@ enum llogd_rpc_ops {LLOG_ORIGIN_HANDLE_READ_HEADER =503 ,LLOG_ORIGIN_HANDLE_WRITE_REC =504 ,LLOG_ORIGIN_HANDLE_CLOSE =505 , -LLOG_ORIGIN_CONNECT =506 , +LLOG_ORIGIN_CONNECT =506 ,LLOG_CATINFO =507 ,/* deprecated */ LLOG_ORIGIN_HANDLE_PREV_BLOCK =508 , LLOG_ORIGIN_HANDLE_DESTROY = 509, /* for destroy llog object*/
@@ -3064,17 +3105,18 @@ struct obdo {__u64 o_ioepoch;/* epoch in ost writes */ __u32 o_stripe_idx;/* holds stripe idx */ __u32 o_parent_ver; -struct lustre_handle o_handle;/* brw: lock handle to prolong -* locks */ -struct llog_cookie o_lcookie;/* destroy: unlink cookie from -* MDS */ +struct lustre_handle o_handle;/* brw: lock handle to prolong locks +*/ +struct llog_cookie o_lcookie;/* destroy: unlink cookie from MDS +*/ __u32 o_uid_h;__u32 o_gid_h;__u64 o_data_version;/* getattr: sum of iversion for * each stripe. * brw: grant space consumed on -* the client for the write */ +* the client for the write +*/ __u64 o_padding_4;__u64 o_padding_5;__u64 o_padding_6;
@@ -3098,7 +3140,8 @@ static inline void lustre_set_wire_obdo(struct obd_connect_data *ocd,if (unlikely (!(ocd->ocd_connect_flags &OBD_CONNECT_FID )) &&fid_seq_is_echo (ostid_seq (&lobdo->o_oi))) {/* 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_seq =fid_seq (&lobdo->o_oi.oi_fid); }
@@ -3184,7 +3227,8 @@ enum sec_cmd {#define CAPA_HMAC_KEY_MAX_LEN 56/* NB take care when changing the sequence of elements this struct, -* because the offset info is used in find_capa() */ +* because the offset info is used in find_capa() +*/ struct lustre_capa {struct lu_fid lc_fid;/** fid */ __u64 lc_opc;/** operations allowed */
Signature · 1 line
2.1.0
PATCH 42/56 staging/lustre/include: Adjust comment style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This fixes most of the
"Block comments use a trailing */ on a separate line" checkpatch warnings, also some slight reformats of structures or comments at places.
--- drivers/staging/lustre/lustre/include/cl_object.h | 69 ++++++++++++++-------- drivers/staging/lustre/lustre/include/lclient.h | 3 +- .../staging/lustre/lustre/include/lprocfs_status.h | 13 ++-- drivers/staging/lustre/lustre/include/lu_object.h | 6 +- .../lustre/lustre/include/lustre/ll_fiemap.h | 63 ++++++++++++-------- .../lustre/lustre/include/lustre/lustre_user.h | 52 ++++++++++------ drivers/staging/lustre/lustre/include/lustre_cfg.h | 9 ++- .../staging/lustre/lustre/include/lustre_disk.h | 27 +++++---- drivers/staging/lustre/lustre/include/lustre_dlm.h | 29 +++++---- .../lustre/lustre/include/lustre_dlm_flags.h | 51 ++++++++++------ .../staging/lustre/lustre/include/lustre_export.h | 3 +- drivers/staging/lustre/lustre/include/lustre_fid.h | 18 ++++-- drivers/staging/lustre/lustre/include/lustre_fld.h | 33 ++++------- .../staging/lustre/lustre/include/lustre_handles.h | 3 +- .../staging/lustre/lustre/include/lustre_import.h | 3 +- drivers/staging/lustre/lustre/include/lustre_lib.h | 3 +- drivers/staging/lustre/lustre/include/lustre_log.h | 3 +- drivers/staging/lustre/lustre/include/lustre_mdc.h | 6 +- drivers/staging/lustre/lustre/include/lustre_net.h | 39 +++++++----- drivers/staging/lustre/lustre/include/obd.h | 58 ++++++++++-------- drivers/staging/lustre/lustre/include/obd_cksum.h | 9 ++- drivers/staging/lustre/lustre/include/obd_class.h | 50 ++++++++++------ .../staging/lustre/lustre/include/obd_support.h | 18 +++--- 23 files changed, 352 insertions(+), 216 deletions(-)
drivers/staging/lustre/lustre/include/cl_object.h +45 -24
@@ -157,7 +157,8 @@ struct cl_device { };/** \addtogroup cl_object cl_object -* @{ */ +* @{ +*/ /** * "Data attributes" of cl_object. Data attributes can be updated * independently for a sub-object, and top-object's attributes are calculated
@@ -288,13 +289,14 @@ struct cl_object_conf {enum {/** configure layout, set up a new stripe, must be called while -* holding layout lock. */ +* holding layout lock. +*/ OBJECT_CONF_SET =0 ,/** invalidate the current stripe configuration due to losing -* layout lock. */ +* layout lock. +*/ OBJECT_CONF_INVALIDATE =1 , -/** wait for old layout to go away so that new layout can be -* set up. */ +/** wait for old layout to go away so that new layout can be set up. */ OBJECT_CONF_WAIT =2 };
@@ -393,7 +395,8 @@ struct cl_object_operations {*/ struct cl_object_header {/** Standard lu_object_header. cl_object::co_lu::lo_header points -* here. */ +* here. +*/ struct lu_object_header coh_lu;/** \name locks * \todo XXX move locks below to the separate cache-lines, they are
@@ -464,7 +467,8 @@ struct cl_object_header {#define CL_PAGE_EOF ((pgoff_t)~0ull)/** \addtogroup cl_page cl_page -* @{ */ +* @{ +*/ /** \struct cl_page * Layered client page.
@@ -687,12 +691,14 @@ enum cl_page_state {enum cl_page_type {/** Host page, the page is from the host inode which the cl_page -* belongs to. */ +* belongs to. +*/ CPT_CACHEABLE =1 ,/** Transient page, the transient cl_page is used to bind a cl_page * to vmpage which is not belonging to the same object of cl_page. -* it is used in DirectIO, lockless IO and liblustre. */ +* it is used in DirectIO, lockless IO and liblustre. +*/ CPT_TRANSIENT , };
@@ -728,7 +734,8 @@ struct cl_page {/** Parent page, NULL for top-level page. Immutable after creation. */ struct cl_page *cp_parent;/** Lower-layer page. NULL for bottommost page. Immutable after -* creation. */ +* creation. +*/ struct cl_page *cp_child;/** * Page state. This field is const to avoid accidental update, it is
@@ -1126,7 +1133,8 @@ static inline int __page_in_use(const struct cl_page *page, int refc)/** @} cl_page */ /** \addtogroup cl_lock cl_lock -* @{ */ +* @{ +*/ /** \struct cl_lock * * Extent locking on the client.
@@ -1641,7 +1649,8 @@ struct cl_lock {struct cl_lock_slice {struct cl_lock *cls_lock;/** Object slice corresponding to this lock slice. Immutable after -* creation. */ +* creation. +*/ struct cl_object *cls_obj;const struct cl_lock_operations *cls_ops;/** Linkage into cl_lock::cll_layers. Immutable after creation. */
@@ -1885,7 +1894,8 @@ struct cl_2queue {/** @} cl_page_list */ /** \addtogroup cl_io cl_io -* @{ */ +* @{ +*/ /** \struct cl_io * I/O *
@@ -2284,7 +2294,8 @@ enum cl_fsync_mode {/** discard all of dirty pages in a specific file range */ CL_FSYNC_DISCARD =2 ,/** start writeback and make sure they have reached storage before -* return. OST_SYNC RPC must be issued and finished */ +* return. OST_SYNC RPC must be issued and finished +*/ CL_FSYNC_ALL = 3 };
@@ -2403,7 +2414,8 @@ struct cl_io {/** @} cl_io */ /** \addtogroup cl_req cl_req -* @{ */ +* @{ +*/ /** \struct cl_req * Transfer. *
@@ -2582,7 +2594,8 @@ enum cache_stats_item {/** how many entities are in the cache right now */ CS_total,/** how many entities in the cache are actively used (and cannot be -* evicted) right now */ +* evicted) right now +*/ CS_busy,/** how many entities were created at all */ CS_create,
@@ -2725,7 +2738,8 @@ void cl_req_slice_add(struct cl_req *req, struct cl_req_slice *slice,/** @} helpers */ /** \defgroup cl_object cl_object -* @{ */ +* @{ +*/ struct cl_object *cl_object_top (struct cl_object *o); struct cl_object *cl_object_find(const struct lu_env *env, struct cl_device *cd, const struct lu_fid *fid,
@@ -2770,7 +2784,8 @@ static inline void *cl_object_page_slice(struct cl_object *clob,/** @} cl_object */ /** \defgroup cl_page cl_page -* @{ */ +* @{ +*/ enum {CLP_GANG_OKAY =0 ,CLP_GANG_RESCHED ,
@@ -2888,7 +2903,8 @@ void cl_lock_descr_print(const struct lu_env *env, void *cookie,/** @} cl_page */ /** \defgroup cl_lock cl_lock -* @{ */ +* @{ +*/ struct cl_lock *cl_lock_hold(const struct lu_env *env, const struct cl_io *io, const struct cl_lock_descr *need,
@@ -2966,7 +2982,8 @@ int cl_lock_enqueue_wait(const struct lu_env *env, struct cl_lock *lock,* * cl_use_try() NONE cl_lock_operations::clo_use() CLS_HELD * -* @{ */ +* @{ +*/ int cl_wait (const struct lu_env *env,struct cl_lock *lock);void cl_unuse (const struct lu_env *env,struct cl_lock *lock);
@@ -3019,7 +3036,8 @@ unsigned long cl_lock_weigh(const struct lu_env *env, struct cl_lock *lock);/** @} cl_lock */ /** \defgroup cl_io cl_io -* @{ */ +* @{ +*/ int cl_io_init (const struct lu_env *env,struct cl_io *io,enum cl_io_type iot,struct cl_object *obj);
@@ -3094,7 +3112,8 @@ do { \/** @} cl_io */ /** \defgroup cl_page_list cl_page_list -* @{ */ +* @{ +*/ /** * Last page in the page list.
@@ -3137,7 +3156,8 @@ void cl_2queue_init_page(struct cl_2queue *queue, struct cl_page *page);/** @} cl_page_list */ /** \defgroup cl_req cl_req -* @{ */ +* @{ +*/ struct cl_req *cl_req_alloc (const struct lu_env *env,struct cl_page *page,enum cl_req_type crt,int nr_objects);
@@ -3214,7 +3234,8 @@ void cl_sync_io_note(struct cl_sync_io *anchor, int ioret);* - cl_env_reexit(cl_env_reenter had to be called priorly) * * \see lu_env, lu_context, lu_context_key -* @{ */ +* @{ +*/ struct cl_env_nest {int cen_refcheck;
drivers/staging/lustre/lustre/include/lclient.h +2 -1
@@ -383,7 +383,8 @@ void cl_put_grouplock(struct ccc_grouplock *cg);* * NB: If you find you have to use these interfaces for your new code, please * think about it again. These interfaces may be removed in the future for -* better layering. */ +* better layering. +*/ struct lov_stripe_md *lov_lsm_get (struct cl_object *clobj);void lov_lsm_put (struct cl_object *clobj,struct lov_stripe_md *lsm);int lov_read_and_clear_async_rc (struct cl_object *clob);
drivers/staging/lustre/lustre/include/lprocfs_status.h +8 -5
@@ -175,7 +175,8 @@ struct lprocfs_percpu {enum lprocfs_stats_flags {LPROCFS_STATS_FLAG_NONE =0x0000 ,/* per cpu counter */ LPROCFS_STATS_FLAG_NOPERCPU =0x0001 ,/* stats have no percpu -* area and need locking */ +* area and need locking +*/ LPROCFS_STATS_FLAG_IRQ_SAFE =0x0002 ,/* alloc need irq safe */ };
@@ -196,7 +197,8 @@ struct lprocfs_stats {unsigned short ls_biggest_alloc_num;enum lprocfs_stats_flags ls_flags;/* Lock used when there are no percpu stats areas; For percpu stats, -* it is used to protect ls_biggest_alloc_num change */ +* it is used to protect ls_biggest_alloc_num change +*/ spinlock_t ls_lock;/* has ls_num of counter headers */
@@ -611,9 +613,10 @@ int lprocfs_single_release(struct inode *, struct file *);int lprocfs_seq_release (struct inode *,struct file *);/* write the name##_seq_show function, call LPROC_SEQ_FOPS_RO for read-only -proc entries; otherwise, you will define name##_seq_write function also for -a read-write proc entry, and then call LPROC_SEQ_SEQ instead. Finally, -call ldebugfs_obd_seq_create(obd, filename, 0444, &name#_fops, data); */ +* proc entries; otherwise, you will define name##_seq_write function also for +* a read-write proc entry, and then call LPROC_SEQ_SEQ instead. Finally, +* call ldebugfs_obd_seq_create(obd, filename, 0444, &name#_fops, data); +*/ #define __LPROC_SEQ_FOPS (name, custom_seq_write) \ static int name##_single_open(struct inode *inode, struct file *file) \ { \
drivers/staging/lustre/lustre/include/lu_object.h +4 -2
@@ -166,7 +166,8 @@ struct lu_device_operations {*/ enum loc_flags {/* This is a new object to be allocated, or the file -* corresponding to the object does not exists. */ +* corresponding to the object does not exists. +*/ LOC_F_NEW =0x00000001 , };
@@ -895,7 +896,8 @@ enum lu_xattr_flags {/** @} helpers */ /** \name lu_context -* @{ */ +* @{ +*/ /** For lu_context health-checks */ enum lu_context_state {
drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h +39 -24
92 lines not on this page · raw message
drivers/staging/lustre/lustre/include/lustre/lustre_user.h +33 -19
138 lines not on this page · raw message
drivers/staging/lustre/lustre/include/lustre_cfg.h +6 -3
@@ -55,7 +55,8 @@/** If the LCFG_REQUIRED bit is set in a configuration command, * then the client is required to understand this parameter * in order to mount the filesystem. If it does not understand -* a REQUIRED command the client mount will fail. */ +* a REQUIRED command the client mount will fail. +*/ #define LCFG_REQUIRED 0x0001000enum lcfg_command_type {
@@ -87,9 +88,11 @@ enum lcfg_command_type {LCFG_POOL_DEL =0x00ce023 ,/**< destroy an ost pool name */ LCFG_SET_LDLM_TIMEOUT =0x00ce030 ,/**< set ldlm_timeout */ LCFG_PRE_CLEANUP =0x00cf031 ,/**< call type-specific pre -* cleanup cleanup */ +* cleanup cleanup +*/ LCFG_SET_PARAM = 0x00ce032, /**< use set_param syntax to set - *a proc parameters */ + * a proc parameters + */ }; struct lustre_cfg_bufs {
drivers/staging/lustre/lustre/include/lustre_disk.h +16 -11
@@ -65,7 +65,8 @@/****************** mount command *********************/ /* The lmd is only used internally by Lustre; mount simply passes -everything as string options */ +* everything as string options +*/ #define LMD_MAGIC 0xbdacbd03#define LMD_PARAMS_MAXLEN 4096
@@ -79,23 +80,26 @@ struct lustre_mount_data {int lmd_recovery_time_soft;int lmd_recovery_time_hard;char *lmd_dev;/* device name */ -char *lmd_profile;/* client only */ +char *lmd_profile;/* client only */ char *lmd_mgssec;/* sptlrpc flavor to mgs */ -char *lmd_opts;/* lustre mount options (as opposed to -_device_ mount options) */ +char *lmd_opts;/* lustre mount options (as opposed to +* _device_ mount options) +*/ char *lmd_params;/* lustre params */ -__u32 *lmd_exclude;/* array of OSTs to ignore */ -char *lmd_mgs;/* MGS nid */ -char *lmd_osd_type;/* OSD type */ +__u32 *lmd_exclude;/* array of OSTs to ignore */ +char *lmd_mgs;/* MGS nid */ +char *lmd_osd_type;/* OSD type */ };#define LMD_FLG_SERVER 0x0001/* Mounting a server */ #define LMD_FLG_CLIENT 0x0002/* Mounting a client */ #define LMD_FLG_ABORT_RECOV 0x0008/* Abort recovery */ #define LMD_FLG_NOSVC 0x0010/* Only start MGS/MGC for servers, -no other services */ -#define LMD_FLG_NOMGS 0x0020/* Only start target for servers, reusing -existing MGS services */ +* no other services +*/ +#define LMD_FLG_NOMGS 0x0020/* Only start target for servers, +* reusing existing MGS services +*/ #define LMD_FLG_WRITECONF 0x0040/* Rewrite config log */ #define LMD_FLG_NOIR 0x0080/* NO imperative recovery */ #define LMD_FLG_NOSCRUB 0x0100/* Do not trigger scrub automatically */
@@ -135,7 +139,8 @@ struct lustre_sb_info {char lsi_osd_type[16 ];char lsi_fstype[16 ];struct backing_dev_info lsi_bdi;/* each client mountpoint needs -own backing_dev_info */ +* own backing_dev_info +*/ };#define LSI_UMOUNT_FAILOVER 0x00200000
drivers/staging/lustre/lustre/include/lustre_dlm.h +19 -10
@@ -250,7 +250,8 @@ struct ldlm_pool {/** Current biggest client lock volume. Protected by pl_lock. */ __u64 pl_client_lock_volume;/** Lock volume factor. SLV on client is calculated as following: -* server_slv * lock_volume_factor. */ +* server_slv * lock_volume_factor. +*/ atomic_t pl_lock_volume_factor;/** Time when last SLV from server was obtained. */ time64_t pl_recalc_time;
@@ -501,7 +502,8 @@ struct ldlm_glimpse_work {struct list_head gl_list;/* linkage to other gl work structs */ __u32 gl_flags;/* see LDLM_GL_WORK_* below */ union ldlm_gl_desc *gl_desc;/* glimpse descriptor to be packed in -* glimpse callback request */ +* glimpse callback request +*/ };/** The ldlm_glimpse_work is allocated on the stack and should not be freed. */
@@ -510,8 +512,9 @@ struct ldlm_glimpse_work {/** Interval node data for each LDLM_EXTENT lock. */ struct ldlm_interval {struct interval_node li_node;/* node for tree management */ -struct list_head li_group;/* the locks which have the same -* policy - group of the policy */ +struct list_head li_group;/* the locks which have the same +* policy - group of the policy +*/ };#define to_ldlm_interval (n) container_of(n, struct ldlm_interval, li_node)
@@ -537,7 +540,8 @@ enum ldlm_cancel_flags {LCF_ASYNC =0x1 ,/* Cancel locks asynchronously. */ LCF_LOCAL =0x2 ,/* Cancel locks locally, not notifing server */ LCF_BL_AST = 0x4, /* Cancel locks marked as LDLM_FL_BL_AST - * in the same RPC */ + * in the same RPC + */ }; struct ldlm_flock {
@@ -839,12 +843,14 @@ struct ldlm_resource {/** * protected by lr_lock -* @{ */ +* @{ +*/ /** List of locks in granted state */ struct list_head lr_granted;/** * List of locks that could not be granted due to conflicts and -* that are waiting for conflicts to go away */ +* that are waiting for conflicts to go away +*/ struct list_head lr_waiting;/** @} */
@@ -1036,7 +1042,8 @@ typedef int (*ldlm_res_iterator_t)(struct ldlm_resource *, void *);* * LDLM provides for a way to iterate through every lock on a resource or * namespace or every resource in a namespace. -* @{ */ +* @{ +*/ int ldlm_resource_iterate (struct ldlm_namespace *,const struct ldlm_res_id *,ldlm_iterator_t iter,void *data);/** @} ldlm_iterator */
@@ -1214,7 +1221,8 @@ int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *,* These AST handlers are typically used for server-side local locks and are * also used by client-side lock handlers to perform minimum level base * processing. -* @{ */ +* @{ +*/ int ldlm_completion_ast_async (struct ldlm_lock *lock,__u64 flags,void *data);int ldlm_completion_ast (struct ldlm_lock *lock,__u64 flags,void *data);/** @} ldlm_local_ast */
@@ -1222,7 +1230,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data);/** \defgroup ldlm_cli_api API to operate on locks from actual LDLM users. * These are typically used by client and server (*_local versions) * to obtain and release locks. -* @{ */ +* @{ +*/ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, struct ldlm_enqueue_info *einfo, const struct ldlm_res_id *res_id,
drivers/staging/lustre/lustre/include/lustre_dlm_flags.h +34 -17
153 lines not on this page · raw message
drivers/staging/lustre/lustre/include/lustre_export.h +2 -1
@@ -123,7 +123,8 @@ struct obd_export {*/ spinlock_t exp_lock;/** Compatibility flags for this export are embedded into -* exp_connect_data */ +* exp_connect_data +*/ struct obd_connect_data exp_connect_data;enum obd_option exp_flags; unsigned long exp_failed:1,
drivers/staging/lustre/lustre/include/lustre_fid.h +12 -6
@@ -251,7 +251,8 @@ static inline void lu_local_name_obj_fid(struct lu_fid *fid, __u32 oid)/* For new FS (>= 2.4), the root FID will be changed to * [FID_SEQ_ROOT:1:0], for existing FS, (upgraded to 2.4), -* the root FID will still be IGIF */ +* the root FID will still be IGIF +*/ static inline int fid_is_root (const struct lu_fid *fid) { return unlikely((fid_seq(fid) == FID_SEQ_ROOT &&
@@ -294,7 +295,8 @@ static inline int fid_is_namespace_visible(const struct lu_fid *fid)const __u64 seq =fid_seq (fid);/* Here, we cannot distinguish whether the normal FID is for OST -* object or not. It is caller's duty to check more if needed. */ +* object or not. It is caller's duty to check more if needed. +*/ return (!fid_is_last_id (fid) && (fid_seq_is_norm (seq) ||fid_seq_is_igif (seq))) ||fid_is_root (fid) ||fid_is_dot_lustre (fid);
@@ -516,7 +518,8 @@ static inline int ostid_res_name_eq(struct ost_id *oi, struct ldlm_res_id *name) {/* Note: it is just a trick here to save some effort, probably the -* correct way would be turn them into the FID and compare */ +* correct way would be turn them into the FID and compare +*/ if (fid_seq_is_mdt0 (ostid_seq (oi))) {return name->name[LUSTRE_RES_ID_SEQ_OFF ] ==ostid_id (oi) && name->name[LUSTRE_RES_ID_VER_OID_OFF ] ==ostid_seq (oi);
@@ -589,12 +592,14 @@ static inline __u64 fid_flatten(const struct lu_fid *fid)static inline __u32 fid_hash (const struct lu_fid *f,int bits) {/* all objects with same id and different versions will belong to same -* collisions list. */ +* collisions list. +*/ return hash_long (fid_flatten (f), bits); }/** -* map fid to 32 bit value for ino on 32bit systems. */ +* map fid to 32 bit value for ino on 32bit systems. +*/ static inline __u32 fid_flatten32 (const struct lu_fid *fid) {__u32 ino;
@@ -611,7 +616,8 @@ static inline __u32 fid_flatten32(const struct lu_fid *fid)* that inodes generated at about the same time have a reduced chance * of collisions. This will give a period of 2^12 = 1024 unique clients * (from SEQ) and up to min(LUSTRE_SEQ_MAX_WIDTH, 2^20) = 128k objects -* (from OID), or up to 128M inodes without collisions for new files. */ +* (from OID), or up to 128M inodes without collisions for new files. +*/ ino = ((seq &0x000fffffULL ) <<12 ) + ((seq >>8 ) &0xfffff000 ) + (seq >> (64 - (40 -8 )) &0xffffff00 ) + (fid_oid (fid) &0xff000fff ) + ((fid_oid (fid) &0x00fff000 ) <<8 );
drivers/staging/lustre/lustre/include/lustre_fld.h +12 -21
@@ -71,50 +71,41 @@ struct lu_fld_target {struct lu_server_fld {/** * super sequence controller export, needed to forward fld -* lookup request. */ +* lookup request. +*/ struct obd_export *lsf_control_exp; -/** -* Client FLD cache. */ +/** Client FLD cache. */ struct fld_cache *lsf_cache; -/** -* Protect index modifications */ +/** Protect index modifications */ struct mutex lsf_lock; -/** -* Fld service name in form "fld-srv-lustre-MDTXXX" */ +/** Fld service name in form "fld-srv-lustre-MDTXXX" */ char lsf_name[LUSTRE_MDT_MAXNAMELEN ]; };struct lu_client_fld { -/** -* Client side debugfs entry. */ +/** Client side debugfs entry. */ struct dentry *lcf_debugfs_entry; -/** -* List of exports client FLD knows about. */ +/** List of exports client FLD knows about. */ struct list_head lcf_targets; -/** -* Current hash to be used to chose an export. */ +/** Current hash to be used to chose an export. */ struct lu_fld_hash *lcf_hash; -/** -* Exports count. */ +/** Exports count. */ int lcf_count; -/** -* Lock protecting exports list and fld_hash. */ +/** Lock protecting exports list and fld_hash. */ spinlock_t lcf_lock; -/** -* Client FLD cache. */ +/** Client FLD cache. */ struct fld_cache *lcf_cache; -/** -* Client fld debugfs entry name. */ +/** Client fld debugfs entry name. */ char lcf_name[LUSTRE_MDT_MAXNAMELEN ];int lcf_flags;
drivers/staging/lustre/lustre/include/lustre_handles.h +2 -1
@@ -65,7 +65,8 @@ struct portals_handle_ops {* * Now you're able to assign the results of cookie2handle directly to an * ldlm_lock. If it's not@the top, you'll want to use container_of() -* to compute the start of the structure based on the handle field. */ +* to compute the start of the structure based on the handle field. +*/ struct portals_handle {struct list_head h_link;__u64 h_cookie;
drivers/staging/lustre/lustre/include/lustre_import.h +2 -1
@@ -292,7 +292,8 @@ struct obd_import {/* need IR MNE swab */ imp_need_mne_swab:1, /* import must be reconnected instead of - * chose new connection */ + * chosing new connection + */ imp_force_reconnect:1, /* import has tried to connect with server */ imp_connect_tried:1;
drivers/staging/lustre/lustre/include/lustre_lib.h +2 -1
@@ -387,7 +387,8 @@ static inline void obd_ioctl_freedata(char *buf, int len)*/ /* Until such time as we get_info the per-stripe maximum from the OST, -* we define this to be 2T - 4k, which is the ext3 maxbytes. */ +* we define this to be 2T - 4k, which is the ext3 maxbytes. +*/ #define LUSTRE_STRIPE_MAXBYTES 0x1fffffff000ULL/* Special values for remove LOV EA from disk */
drivers/staging/lustre/lustre/include/lustre_log.h +2 -1
@@ -241,7 +241,8 @@ struct llog_ctxt {struct obd_llog_group *loc_olg;/* group containing that ctxt */ struct obd_export *loc_exp;/* parent "disk" export (e.g. MDS) */ struct obd_import *loc_imp;/* to use in RPC's: can be backward -pointing import */ +* pointing import +*/ struct llog_operations *loc_logops;struct llog_handle *loc_handle;struct mutex loc_mutex;/* protect loc_imp */
drivers/staging/lustre/lustre/include/lustre_mdc.h +4 -2
@@ -90,7 +90,8 @@ static inline void mdc_get_rpc_lock(struct mdc_rpc_lock *lck,* done, then set rpcl_it to MDC_FAKE_RPCL_IT. Once that is set * it will only be cleared when all fake requests are finished. * Only when all fake requests are finished can normal requests -* be sent, to ensure they are recoverable again. */ +* be sent, to ensure they are recoverable again. +*/ again:mutex_lock (&lck->rpcl_mutex);
@@ -105,7 +106,8 @@ static inline void mdc_get_rpc_lock(struct mdc_rpc_lock *lck,* just turned off but there are still requests in progress. * Wait until they finish. It doesn't need to be efficient * in this extremely rare case, just have low overhead in -* the common case when it isn't true. */ +* the common case when it isn't true. +*/ while (unlikely (lck->rpcl_it ==MDC_FAKE_RPCL_IT )) {mutex_unlock (&lck->rpcl_mutex);schedule_timeout (cfs_time_seconds (1 ) /4 );
drivers/staging/lustre/lustre/include/lustre_net.h +25 -14
@@ -76,7 +76,8 @@* In order for the client and server to properly negotiate the maximum * possible transfer size, PTLRPC_BULK_OPS_COUNT must be a power-of-two * value. The client is free to limit the actual RPC size for any bulk -* transfer via cl_max_pages_per_rpc to some non-power-of-two value. */ +* transfer via cl_max_pages_per_rpc to some non-power-of-two value. +*/ #define PTLRPC_BULK_OPS_BITS 2#define PTLRPC_BULK_OPS_COUNT (1U << PTLRPC_BULK_OPS_BITS)/**
@@ -85,7 +86,8 @@* protocol limitation on the maximum RPC size that can be used by any * RPC sent to that server in the future. Instead, the server should * use the negotiated per-client ocd_brw_size to determine the bulk -* RPC count. */ +* RPC count. +*/ #define PTLRPC_BULK_OPS_MASK (~((__u64)PTLRPC_BULK_OPS_COUNT - 1))/**
@@ -419,16 +421,18 @@ struct ptlrpc_reply_state {/** A spinlock to protect the reply state flags */ spinlock_t rs_lock;/** Reply state flags */ - unsigned long rs_difficult:1; /* ACK/commit stuff */ + unsigned long rs_difficult:1; /* ACK/commit stuff */ unsigned long rs_no_ack:1; /* no ACK, even for -difficult requests */ +* difficult requests +*/ unsigned long rs_scheduled:1; /* being handled? */ unsigned long rs_scheduled_ever:1;/* any schedule attempts? */ unsigned long rs_handled:1; /* been handled yet? */ unsigned long rs_on_net:1; /* reply_out_callback pending? */ unsigned long rs_prealloc:1; /* rs from prealloc list */ unsigned long rs_committed:1;/* the transaction was committed -* and the rs was dispatched */ +* and the rs was dispatched +*/ /** Size of the state */ int rs_size;/** opcode */
@@ -1181,7 +1185,7 @@ struct nrs_fifo_req {* purpose of this object is to hold references to the request's resources * for the lifetime of the request, and to hold properties that policies use * use for determining the request's scheduling priority. -* */ +*/ struct ptlrpc_nrs_request {/** * The request's resource hierarchy.
@@ -1321,15 +1325,17 @@ struct ptlrpc_request {/* do not resend request on -EINPROGRESS */ rq_no_retry_einprogress:1 ,/* allow the req to be sent if the import is in recovery -* status */ +* status +*/ rq_allow_replay:1;unsigned int rq_nr_resend;enum rq_phase rq_phase;/* one of RQ_PHASE_* */ enum rq_phase rq_next_phase;/* one of RQ_PHASE_* to be used next */ -atomic_t rq_refcount;/* client-side refcount for SENT race, -server-side refcount for multiple replies */ +atomic_t rq_refcount;/* client-side refcount for SENT race, +* server-side refcount for multiple replies +*/ /** Portal to which this request would be sent */ short rq_request_portal;/* XXX FIXME bug 249 */
@@ -1363,7 +1369,8 @@ struct ptlrpc_request {/** * security and encryption data -* @{ */ +* @{ +*/ struct ptlrpc_cli_ctx *rq_cli_ctx;/**< client's half ctx */ struct ptlrpc_svc_ctx *rq_svc_ctx;/**< server's half ctx */ struct list_head rq_ctx_chain;/**< link to waited ctx */
@@ -1477,7 +1484,8 @@ struct ptlrpc_request {/** when request must finish. volatile * so that servers' early reply updates to the deadline aren't -* kept in per-cpu cache */ +* kept in per-cpu cache +*/ volatile time64_t rq_deadline;/** when req reply unlink must finish. */ time64_t rq_reply_deadline;
@@ -1678,7 +1686,8 @@ do { \/** * This is the debug print function you need to use to print request structure * content into lustre debug log. -* for most callers (level is a constant) this is resolved at compile time */ +* for most callers (level is a constant) this is resolved@compile time +*/ #define DEBUG_REQ(level, req, fmt, args...) \ do { \ if ((level) & (D_ERROR | D_WARNING)) { \
@@ -2101,7 +2110,8 @@ struct ptlrpc_service_part {/** NRS head for regular requests */ struct ptlrpc_nrs scp_nrs_reg;/** NRS head for HP requests; this is only valid for services that can -* handle HP requests */ +* handle HP requests +*/ struct ptlrpc_nrs *scp_nrs_hp;/** AT stuff */
@@ -2460,7 +2470,8 @@ struct ptlrpc_service_thr_conf {/* "soft" limit for total threads number */ unsigned int tc_nthrs_max;/* user specified threads number, it will be validated due to -* other members of this structure. */ +* other members of this structure. +*/ unsigned int tc_nthrs_user;/* set NUMA node affinity for service threads */ unsigned int tc_cpu_affinity;
drivers/staging/lustre/lustre/include/obd.h +35 -23
162 lines not on this page · raw message
drivers/staging/lustre/lustre/include/obd_cksum.h +6 -3
@@ -63,7 +63,8 @@ static inline unsigned char cksum_obd2cfs(enum cksum_type cksum_type)* In case of an unsupported types/flags we fall back to ADLER * because that is supported by all clients since 1.8 * -* In case multiple algorithms are supported the best one is used. */ +* In case multiple algorithms are supported the best one is used. +*/ static inline u32 cksum_type_pack (enum cksum_type cksum_type) {unsigned int performance =0 , tmp;
@@ -139,14 +140,16 @@ static inline enum cksum_type cksum_types_supported_client(void)* Currently, calling cksum_type_pack() with a mask will return the fastest * checksum type due to its benchmarking at libcfs module load. * Caution is advised, however, since what is fastest on a single client may -* not be the fastest or most efficient algorithm on the server. */ +* not be the fastest or most efficient algorithm on the server. +*/ static inline enum cksum_type cksum_type_select (enum cksum_type cksum_types) {return cksum_type_unpack (cksum_type_pack (cksum_types)); }/* Checksum algorithm names. Must be defined in the same order as the -* OBD_CKSUM_* flags. */ +* OBD_CKSUM_* flags. +*/ #define DECLARE_CKSUM_NAME char *cksum_name[] = {"crc32", "adler", "crc32c"}#endif /* __OBD_H */
drivers/staging/lustre/lustre/include/obd_class.h +31 -19
123 lines not on this page · raw message
drivers/staging/lustre/lustre/include/obd_support.h +11 -7
@@ -47,7 +47,8 @@ extern unsigned int obd_debug_peer_on_timeout;extern unsigned int obd_dump_on_timeout;extern unsigned int obd_dump_on_eviction;/* obd_timeout should only be used for recovery, not for -networking / disk / timings affected by load (use Adaptive Timeouts) */ +* networking / disk / timings affected by load (use Adaptive Timeouts) +*/ extern unsigned int obd_timeout;/* seconds */ extern unsigned int obd_timeout_set;extern unsigned int at_min;
@@ -104,18 +105,21 @@ extern char obd_jobid_var[];* failover targets the client only pings one server at a time, and pings * can be lost on a loaded network. Since eviction has serious consequences, * and there's no urgent need to evict a client just because it's idle, we -* should be very conservative here. */ +* should be very conservative here. +*/ #define PING_EVICT_TIMEOUT (PING_INTERVAL * 6)#define DISK_TIMEOUT 50/* Beyond this we warn about disk speed */ #define CONNECTION_SWITCH_MIN 5U/* Connection switching rate limiter */ -/* Max connect interval for nonresponsive servers; ~50s to avoid building up -connect requests in the LND queues, but within obd_timeout so we don't -miss the recovery window */ +/* Max connect interval for nonresponsive servers; ~50s to avoid building up +* connect requests in the LND queues, but within obd_timeout so we don't +* miss the recovery window +*/ #define CONNECTION_SWITCH_MAX min(50U, max(CONNECTION_SWITCH_MIN, obd_timeout))#define CONNECTION_SWITCH_INC 5/* Connection timeout backoff */ /* In general this should be low to have quick detection of a system -running on a backup server. (If it's too low, import_select_connection -will increase the timeout anyhow.) */ +* running on a backup server. (If it's too low, import_select_connection +* will increase the timeout anyhow.) +*/ #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN, obd_timeout/20)/* The max delay between connects is SWITCH_MAX + SWITCH_INC + INITIAL */ #define RECONNECT_DELAY_MAX (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + \
Signature · 1 line
2.1.0
PATCH 43/56 staging/lustre/fld: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/fld/fld_cache.c | 9 ++++++--- drivers/staging/lustre/lustre/fld/fld_internal.h | 24 ++++++++---------------- drivers/staging/lustre/lustre/fld/fld_request.c | 9 ++++++--- 3 files changed, 20 insertions(+), 22 deletions(-)
drivers/staging/lustre/lustre/fld/fld_cache.c +6 -3
@@ -183,7 +183,8 @@ restart_fixup: }/* we could have overlap over next -* range too. better restart. */ +* range too. better restart. +*/ goto restart_fixup; }
@@ -302,7 +303,8 @@ static void fld_cache_overlap_handle(struct fld_cache *cache,const u32 mdt = range->lsr_index;/* this is overlap case, these case are checking overlapping with -* prev range only. fixup will handle overlapping with next range. */ +* prev range only. fixup will handle overlapping with next range. +*/ if (f_curr->fce_range.lsr_index == mdt) { f_curr->fce_range.lsr_start = min(f_curr->fce_range.lsr_start,
@@ -317,7 +319,8 @@ static void fld_cache_overlap_handle(struct fld_cache *cache, }else if (new_start <= f_curr->fce_range.lsr_start && f_curr->fce_range.lsr_end <= new_end) {/* case 1: new range completely overshadowed existing range. -* e.g. whole range migrated. update fld cache entry */ +* e.g. whole range migrated. update fld cache entry +*/ f_curr->fce_range = *range;kfree (f_new);
drivers/staging/lustre/lustre/fld/fld_internal.h +8 -16
@@ -67,8 +67,7 @@ struct lu_fld_hash {struct fld_cache_entry {struct list_head fce_lru;struct list_head fce_list; -/** -* fld cache entries are sorted on range->lsr_start field. */ +/** fld cache entries are sorted on range->lsr_start field. */ struct lu_seq_range fce_range; };
@@ -79,32 +78,25 @@ struct fld_cache {*/ rwlock_t fci_lock; -/** -* Cache shrink threshold */ +/** Cache shrink threshold */ int fci_threshold; -/** -* Preferred number of cached entries */ +/** Preferred number of cached entries */ int fci_cache_size; -/** -* Current number of cached entries. Protected by \a fci_lock */ +/** Current number of cached entries. Protected by \a fci_lock */ int fci_cache_count; -/** -* LRU list fld entries. */ +/** LRU list fld entries. */ struct list_head fci_lru; -/** -* sorted fld entries. */ +/** sorted fld entries. */ struct list_head fci_entries_head; -/** -* Cache statistics. */ +/** Cache statistics. */ struct fld_stats fci_stat; -/** -* Cache name used for debug and messages. */ +/** Cache name used for debug and messages. */ char fci_name[LUSTRE_MDT_MAXNAMELEN ]; unsigned int fci_no_shrink:1; };
drivers/staging/lustre/lustre/fld/fld_request.c +6 -3
@@ -58,7 +58,8 @@#include "fld_internal.h" /* TODO: these 3 functions are copies of flow-control code from mdc_lib.c -* It should be common thing. The same about mdc RPC lock */ +* It should be common thing. The same about mdc RPC lock +*/ static int fld_req_avail (struct client_obd *cli,struct mdc_cache_waiter *mcw) {int rc;
@@ -124,7 +125,8 @@ fld_rrb_scan(struct lu_client_fld *fld, u64 seq)* it should go to index 0 directly, instead of calculating * hash again, and also if other MDTs is not being connected, * the fld lookup requests(for seq on MDT0) should not be -* blocked because of other MDTs */ +* blocked because of other MDTs +*/ if (fid_seq_is_norm (seq)) hash =fld_rrb_hash (fld, seq);else
@@ -139,7 +141,8 @@ again:if (hash !=0 ) {/* It is possible the remote target(MDT) are not connected to * with client yet, so we will refer this to MDT0, which should -* be connected during mount */ +* be connected during mount +*/ hash =0 ; goto again; }
Signature · 1 line
2.1.0
PATCH 44/56 staging/lustre/fid: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/fid/fid_request.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/fid/fid_request.c +4 -2
@@ -95,7 +95,8 @@ static int seq_client_rpc(struct lu_client_seq *seq,* precreating objects on this OST), and it will send the * request to MDT0 here, so we can not keep resending the * request here, otherwise if MDT0 is failed(umounted), -* it can not release the export of MDT0 */ +* it can not release the export of MDT0 +*/ if (seq->lcs_type ==LUSTRE_SEQ_DATA ) req->rq_no_delay = req->rq_no_resend =1 ; debug_mask =D_CONSOLE ;
@@ -152,7 +153,8 @@ static int seq_client_alloc_meta(const struct lu_env *env,/* If meta server return -EINPROGRESS or EAGAIN, * it means meta server might not be ready to * allocate super sequence from sequence controller -* (MDT0)yet */ +* (MDT0)yet +*/ rc =seq_client_rpc (seq, &seq->lcs_space,SEQ_ALLOC_META ,"meta" ); }while (rc == -EINPROGRESS || rc == -EAGAIN );
Signature · 1 line
2.1.0
PATCH 45/56 staging/lustre/lclient: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/lclient/glimpse.c | 3 ++- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 24 ++++++++++++++-------- .../staging/lustre/lustre/lclient/lcommon_misc.c | 6 ++++-- 3 files changed, 22 insertions(+), 11 deletions(-)
drivers/staging/lustre/lustre/lclient/glimpse.c +2 -1
@@ -109,7 +109,8 @@ int cl_glimpse_lock(const struct lu_env *env, struct cl_io *io,* if there were no conflicting locks. If there * were conflicting locks, enqueuing or waiting * fails with -ENAVAIL, but valid inode -* attributes are returned anyway. */ +* attributes are returned anyway. +*/ *descr = whole_file; descr->cld_obj = clob; descr->cld_mode =CLM_PHANTOM ;
drivers/staging/lustre/lustre/lclient/lcommon_cl.c +16 -8
@@ -613,7 +613,8 @@ void ccc_lock_state(const struct lu_env *env,* stale i_size when doing appending writes and effectively * cancel the result of the truncate. Getting the * ll_inode_size_lock() after the enqueue maintains the DLM -* -> ll_inode_size_lock() acquiring order. */ +* -> ll_inode_size_lock() acquiring order. +*/ if (lock->cll_descr.cld_start ==0 && lock->cll_descr.cld_end ==CL_PAGE_EOF )cl_merge_lvb (env, inode);
@@ -754,7 +755,8 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,* page index, return directly. Do not expect * kernel will check such case correctly. * linux-2.6.18-128.1.1 miss to do that. -* --bug 17336 */ +* --bug 17336 +*/ loff_t size =cl_isize_read (inode);loff_t cur_index = start >>PAGE_CACHE_SHIFT ; loff_t size_index = (size - 1) >>
@@ -884,7 +886,8 @@ again:if (attr->ia_valid &ATTR_FILE )/* populate the file descriptor for ftruncate to honor -* group lock - see LU-787 */ +* group lock - see LU-787 +*/ cio->cui_fd =cl_iattr2fd (inode, attr); result =cl_io_loop (env, io);
@@ -896,7 +899,8 @@ again: goto again;/* HSM import case: file is released, cannot be restored * no need to fail except if restore registration failed -* with -ENODATA */ +* with -ENODATA +*/ if (result == -ENODATA && io->ci_restore_needed && io->ci_result != -ENODATA ) result =0 ;
@@ -1026,7 +1030,8 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)/* clob is slave of inode, empty lli_clob means for new inode, * there is no clob in cache with the given fid, so it is * unnecessary to perform lookup-alloc-lookup-insert, just -* alloc and insert directly. */ +* alloc and insert directly. +*/ LASSERT (inode->i_state &I_NEW ); conf.coc_lu.loc_flags =LOC_F_NEW ; clob = cl_object_find(env, lu2cl_dev(site->ls_top_dev),
@@ -1151,7 +1156,8 @@ __u16 ll_dirent_type_get(struct lu_dirent *ent) }/** -* build inode number from passed @fid */ +* build inode number from passed @fid +*/ __u64 cl_fid_build_ino (const struct lu_fid *fid,int api32) {if (BITS_PER_LONG ==32 || api32)
@@ -1162,7 +1168,8 @@ __u64 cl_fid_build_ino(const struct lu_fid *fid, int api32)/** * build inode generation from passed @fid. If our FID overflows the 32-bit -* inode number then return a non-zero generation to distinguish them. */ +* inode number then return a non-zero generation to distinguish them. +*/ __u32 cl_fid_build_gen (const struct lu_fid *fid) {__u32 gen;
@@ -1183,7 +1190,8 @@ __u32 cl_fid_build_gen(const struct lu_fid *fid)* have to wait for the refcount to become zero to destroy the older layout. * * Notice that the lsm returned by this function may not be valid unless called -* inside layout lock - MDS_INODELOCK_LAYOUT. */ +* inside layout lock - MDS_INODELOCK_LAYOUT. +*/ struct lov_stripe_md *ccc_inode_lsm_get (struct inode *inode) {return lov_lsm_get (cl_i2info (inode)->lli_clob);
drivers/staging/lustre/lustre/lclient/lcommon_misc.c +4 -2
@@ -48,7 +48,8 @@/* Initialize the default and maximum LOV EA and cookie sizes. This allows * us to make MDS RPCs with large enough reply buffers to hold the * maximum-sized (= maximum striped) EA and cookie without having to -* calculate this (via a call into the LOV + OSCs) each time we make an RPC. */ +* calculate this (via a call into the LOV + OSCs) each time we make an RPC. +*/ int cl_init_ea_size (struct obd_export *md_exp,struct obd_export *dt_exp) {struct lov_stripe_md lsm = { .lsm_magic =LOV_MAGIC_V3 };
@@ -74,7 +75,8 @@ int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp) cookiesize = stripes *sizeof (struct llog_cookie );/* default cookiesize is 0 because from 2.4 server doesn't send -* llog cookies to client. */ +* llog cookies to client. +*/ CDEBUG (D_HA ,"updating def/max_easize: %d/%d def/max_cookiesize: 0/%d\n" , def_easize, easize, cookiesize);
Signature · 1 line
2.1.0
PATCH 46/56 staging/lustre/ldlm: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/ldlm/interval_tree.c | 6 +- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 12 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 43 ++++--- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 27 +++-- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 63 ++++++---- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 36 ++++-- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 132 ++++++++++++++------- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 36 ++++-- 9 files changed, 236 insertions(+), 122 deletions(-)
drivers/staging/lustre/lustre/ldlm/interval_tree.c +4 -2
@@ -133,7 +133,8 @@ static void __rotate_change_maxhigh(struct interval_node *node,/* The left rotation "pivots" around the link from node to node->right, and * - node will be linked to node->right's left child, and -* - node->right's left child will be linked to node's right child. */ +* - node->right's left child will be linked to node's right child. +*/ static void __rotate_left (struct interval_node *node,struct interval_node **root) {
@@ -162,7 +163,8 @@ static void __rotate_left(struct interval_node *node,/* The right rotation "pivots" around the link from node to node->left, and * - node will be linked to node->left's right child, and -* - node->left's right child will be linked to node's left child. */ +* - node->left's right child will be linked to node's left child. +*/ static void __rotate_right (struct interval_node *node,struct interval_node **root) {
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +8 -4
@@ -62,7 +62,8 @@* is the "highest lock". This function returns the new KMS value. * Caller must hold lr_lock already. * -* NB: A lock on [x,y] protects a KMS of up to y + 1 bytes! */ +* NB: A lock on [x,y] protects a KMS of up to y + 1 bytes! +*/ __u64 ldlm_extent_shift_kms (struct ldlm_lock *lock,__u64 old_kms) {struct ldlm_resource *res = lock->l_resource;
@@ -72,7 +73,8 @@ __u64 ldlm_extent_shift_kms(struct ldlm_lock *lock, __u64 old_kms)/* don't let another thread in ldlm_extent_shift_kms race in * just after we finish and take our lock into account in its -* calculation of the kms */ +* calculation of the kms +*/ lock->l_flags |=LDLM_FL_KMS_IGNORE ;list_for_each (tmp, &res->lr_granted) {
@@ -85,7 +87,8 @@ __u64 ldlm_extent_shift_kms(struct ldlm_lock *lock, __u64 old_kms)return old_kms;/* This extent _has_ to be smaller than old_kms (checked above) -* so kms can only ever be smaller or the same as old_kms. */ +* so kms can only ever be smaller or the same as old_kms. +*/ if (lck->l_policy_data.l_extent.end +1 > kms) kms = lck->l_policy_data.l_extent.end +1 ; }
@@ -191,7 +194,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, res->lr_itree[idx].lit_size++;/* even though we use interval tree to manage the extent lock, we also -* add the locks into grant list, for debug purpose, .. */ +* add the locks into grant list, for debug purpose, .. +*/ ldlm_resource_add_lock (res, &res->lr_granted, lock); }
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +28 -15
123 lines not on this page · raw message
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +2 -1
@@ -96,7 +96,8 @@ enum {LDLM_CANCEL_SHRINK =1 <<2 ,/* Cancel locks from shrinker. */ LDLM_CANCEL_LRUR =1 <<3 ,/* Cancel locks from lru resize. */ LDLM_CANCEL_NO_WAIT =1 <<4 /* Cancel locks w/o blocking (neither -* sending nor waiting for any rpcs) */ +* sending nor waiting for any rpcs) +*/ }; int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +18 -9
@@ -219,7 +219,8 @@ EXPORT_SYMBOL(client_import_find_conn);void client_destroy_import (struct obd_import *imp) {/* Drop security policy instance after all RPCs have finished/aborted -* to let all busy contexts be released. */ +* to let all busy contexts be released. +*/ class_import_get (imp);class_destroy_import (imp);sptlrpc_import_sec_put (imp);
@@ -245,7 +246,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)int rc;/* In a more perfect world, we would hang a ptlrpc_client off of -* obd_type and just use the values from there. */ +* obd_type and just use the values from there. +*/ if (!strcmp (name,LUSTRE_OSC_NAME )) { rq_portal =OST_REQUEST_PORTAL ; rp_portal =OSC_REPLY_PORTAL ;
@@ -348,7 +350,8 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)/* This value may be reduced@connect time in * ptlrpc_connect_interpret() . We initialize it to only * 1MB until we know what the performance looks like. -* In the future this should likely be increased. LU-1431 */ +* In the future this should likely be increased. LU-1431 +*/ cli->cl_max_pages_per_rpc =min_t (int,PTLRPC_MAX_BRW_PAGES ,LNET_MTU >>PAGE_CACHE_SHIFT );
@@ -545,14 +548,16 @@ int client_disconnect_export(struct obd_export *exp)/* Mark import deactivated now, so we don't try to reconnect if any * of the cleanup RPCs fails (e.g. LDLM cancel, etc). We don't -* fully deactivate the import, or that would drop all requests. */ +* fully deactivate the import, or that would drop all requests. +*/ spin_lock (&imp->imp_lock); imp->imp_deactive =1 ;spin_unlock (&imp->imp_lock);/* Some non-replayable imports (MDS's OSCs) are pinged, so just * delete it regardless. (It's safe to delete an import that was -* never added.) */ +* never added.) +*/ (void )ptlrpc_pinger_del_import (imp);if (obd->obd_namespace) {
@@ -564,7 +569,8 @@ int client_disconnect_export(struct obd_export *exp) }/* There's no need to hold sem while disconnecting an import, -* and it may actually cause deadlock in GSS. */ +* and it may actually cause deadlock in GSS. +*/ up_write (&cli->cl_sem); rc =ptlrpc_disconnect_import (imp,0 );down_write (&cli->cl_sem);
@@ -573,7 +579,8 @@ int client_disconnect_export(struct obd_export *exp) out_disconnect:/* Use server style - class_disconnect should be always called for -* o_disconnect. */ +* o_disconnect. +*/ err =class_disconnect (exp);if (!rc && err) rc = err;
@@ -592,7 +599,8 @@ int target_pack_pool_reply(struct ptlrpc_request *req)struct obd_device *obd;/* Check that we still have all structures alive as this may -* be some late RPC at shutdown time. */ +* be some late RPC at shutdown time. +*/ if (unlikely (!req->rq_export || !req->rq_export->exp_obd || !exp_connect_lru_resize (req->rq_export))) {lustre_msg_set_slv (req->rq_repmsg,0 );
@@ -697,7 +705,8 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)* reply ref until ptlrpc_handle_rs() is done * with the reply state (if the send was successful, there * would have been +1 ref for the net, which -* reply_out_callback leaves alone) */ +* reply_out_callback leaves alone) +*/ rs->rs_on_net =0 ;ptlrpc_rs_addref (rs); }
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +42 -21
184 lines not on this page · raw message
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +23 -13
@@ -194,7 +194,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, goto out; } }else if (ldlm_has_layout (lock)) {/* for layout lock, lvb has -* variable length */ +* variable length +*/ void *lvb_data; lvb_data =kzalloc (lvb_len,GFP_NOFS );
@@ -224,7 +225,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, }/* If we receive the completion AST before the actual enqueue returned, -* then we might need to switch lock modes, resources, or extents. */ +* then we might need to switch lock modes, resources, or extents. +*/ if (dlm_req->lock_desc.l_granted_mode != lock->l_req_mode) { lock->l_req_mode = dlm_req->lock_desc.l_granted_mode;LDLM_DEBUG (lock,"completion AST, new lock mode" );
@@ -256,7 +258,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req,if (dlm_req->lock_flags &LDLM_FL_AST_SENT ) {/* BL_AST locks are not needed in LRU. -* Let ldlm_cancel_lru() be fast. */ +* Let ldlm_cancel_lru() be fast. +*/ ldlm_lock_remove_from_lru (lock); lock->l_flags |=LDLM_FL_CBPENDING |LDLM_FL_BL_AST ;LDLM_DEBUG (lock,"completion AST includes blocking AST" );
@@ -276,8 +279,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req,LDLM_DEBUG (lock,"callback handler finished, about to run_ast_work" ); -/* Let Enqueue to call osc_lock_upcall() and initialize -* l_ast_data */ +/* Let Enqueue to call osc_lock_upcall() and initialize l_ast_data */ OBD_FAIL_TIMEOUT (OBD_FAIL_OSC_CP_ENQ_RACE ,2 );ldlm_run_ast_work (ns, &ast_list,LDLM_WORK_CP_AST );
@@ -371,7 +373,8 @@ static int __ldlm_bl_to_thread(struct ldlm_bl_work_item *blwi,wake_up (&blp->blp_waitq);/* can not check blwi->blwi_flags as blwi could be already freed in -LCF_ASYNC mode */ +* LCF_ASYNC mode +*/ if (!(cancel_flags &LCF_ASYNC ))wait_for_completion (&blwi->blwi_comp);
@@ -541,7 +544,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)/* Requests arrive in sender's byte order. The ptlrpc service * handler has already checked and, if necessary, byte-swapped the * incoming request message body, but I am responsible for the -* message buffers. */ +* message buffers. +*/ /* do nothing for sec context finalize */ if (lustre_msg_get_opc (req->rq_reqmsg) ==SEC_CTX_FINI )
@@ -603,7 +607,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) }/* Force a known safe race, send a cancel to the server for a lock -* which the server has already started a blocking callback on. */ +* which the server has already started a blocking callback on. +*/ if (OBD_FAIL_CHECK (OBD_FAIL_LDLM_CANCEL_BL_CB_RACE ) &&lustre_msg_get_opc (req->rq_reqmsg) ==LDLM_BL_CALLBACK ) { rc =ldlm_cli_cancel (&dlm_req->lock_handle[0 ],0 );
@@ -633,7 +638,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)/* If somebody cancels lock and cache is already dropped, * or lock is failed before cp_ast received on client, * we can tell the server we have no lock. Otherwise, we -* should send cancel after dropping the cache. */ +* should send cancel after dropping the cache. +*/ if (((lock->l_flags &LDLM_FL_CANCELING ) && (lock->l_flags &LDLM_FL_BL_DONE )) || (lock->l_flags &LDLM_FL_FAILED )) {
@@ -647,7 +653,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)return 0 ; }/* BL_AST locks are not needed in LRU. -* Let ldlm_cancel_lru() be fast. */ +* Let ldlm_cancel_lru() be fast. +*/ ldlm_lock_remove_from_lru (lock); lock->l_flags |=LDLM_FL_BL_AST ; }
@@ -660,7 +667,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)* But we'd also like to be able to indicate in the reply that we're * cancelling right now, because it's unused, or have an intent result * in the reply, so we might have to push the responsibility for sending -* the reply down into the AST handlers, alas. */ +* the reply down into the AST handlers, alas. +*/ switch (lustre_msg_get_opc (req->rq_reqmsg)) {case LDLM_BL_CALLBACK :
@@ -809,7 +817,8 @@ static int ldlm_bl_thread_main(void *arg)/* The special case when we cancel locks in LRU * asynchronously, we pass the list of locks here. * Thus locks are marked LDLM_FL_CANCELING, but NOT -* canceled locally yet. */ +* canceled locally yet. +*/ count =ldlm_cli_cancel_list_local (&blwi->blwi_head, blwi->blwi_count,LCF_BL_AST );
@@ -1116,7 +1125,8 @@ void ldlm_exit(void)kmem_cache_destroy (ldlm_resource_slab);/* ldlm_lock_put() use RCU to call ldlm_lock_free, so need call * synchronize_rcu() to wait a grace period elapsed, so that -* ldlm_lock_free() get a chance to be called. */ +* ldlm_lock_free() get a chance to be called. +*/ synchronize_rcu ();kmem_cache_destroy (ldlm_lock_slab);kmem_cache_destroy (ldlm_interval_slab);
drivers/staging/lustre/lustre/ldlm/ldlm_request.c +87 -45
378 lines not on this page · raw message
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +24 -12
@@ -56,7 +56,8 @@ LIST_HEAD(ldlm_srv_namespace_list);struct mutex ldlm_cli_namespace_lock;/* Client Namespaces that have active resources in them. * Once all resources go away, ldlm_poold moves such namespaces to the -* inactive list */ +* inactive list +*/ LIST_HEAD (ldlm_cli_active_namespace_list);/* Client namespaces that don't have any locks in them */ static LIST_HEAD (ldlm_cli_inactive_namespace_list);
@@ -66,7 +67,8 @@ static struct dentry *ldlm_ns_debugfs_dir;struct dentry *ldlm_svc_debugfs_dir;/* during debug dump certain amount of granted locks for one resource to avoid -* DDOS. */ +* DDOS. +*/ static unsigned int ldlm_dump_granted_max =256 ; static ssize_t
@@ -275,7 +277,8 @@ static ssize_t lru_size_store(struct kobject *kobj, struct attribute *attr,ldlm_cancel_lru (ns,0 ,LCF_ASYNC ,LDLM_CANCEL_PASSED );/* Make sure that LRU resize was originally supported before -* turning it on here. */ +* turning it on here. +*/ if (lru_resize && (ns->ns_orig_connect_flags &OBD_CONNECT_LRU_RESIZE )) { CDEBUG(D_DLMTRACE,
@@ -749,7 +752,8 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q,struct lustre_handle lockh;/* First, we look for non-cleaned-yet lock -* all cleaned locks are marked by CLEANED flag. */ +* all cleaned locks are marked by CLEANED flag. +*/ lock_res (res);list_for_each (tmp, q) { lock = list_entry(tmp, struct ldlm_lock,
@@ -769,7 +773,8 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, }/* Set CBPENDING so nothing in the cancellation path -* can match this lock. */ +* can match this lock. +*/ lock->l_flags |=LDLM_FL_CBPENDING ; lock->l_flags |=LDLM_FL_FAILED ; lock->l_flags |= flags;
@@ -782,7 +787,8 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q,/* This is a little bit gross, but much better than the * alternative: pretend that we got a blocking AST from * the server, so that when the lock is decref'd, it -* will go away ... */ +* will go away ... +*/ unlock_res (res);LDLM_DEBUG (lock,"setting FL_LOCAL_ONLY" );if (lock->l_completion_ast)
@@ -873,7 +879,8 @@ force_wait: atomic_read(&ns->ns_bref) == 0, &lwi);/* Forced cleanups should be able to reclaim all references, -* so it's safe to wait forever... we can't leak locks... */ +* so it's safe to wait forever... we can't leak locks... +*/ if (force && rc == -ETIMEDOUT ) { LCONSOLE_ERROR("Forced cleanup waiting for %s namespace with %d resources in use, (rc=%d)\n", ldlm_ns_name(ns),
@@ -943,7 +950,8 @@ static void ldlm_namespace_unregister(struct ldlm_namespace *ns,LASSERT (!list_empty (&ns->ns_list_chain));/* Some asserts and possibly other parts of the code are still * using list_empty(&ns->ns_list_chain). This is why it is -* important to use list_del_init() here. */ +* important to use list_del_init() here. +*/ list_del_init (&ns->ns_list_chain);ldlm_namespace_nr_dec (client);mutex_unlock (ldlm_namespace_lock (client));
@@ -963,7 +971,8 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns)ldlm_namespace_unregister (ns, ns->ns_client);/* Fini pool _before_ parent proc dir is removed. This is important as * ldlm_pool_fini() removes own proc dir which is child to @dir. -* Removing it after @dir may cause oops. */ +* Removing it after @dir may cause oops. +*/ ldlm_pool_fini (&ns->ns_pool);ldlm_namespace_debugfs_unregister (ns);
@@ -971,7 +980,8 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns)cfs_hash_putref (ns->ns_rs_hash);/* Namespace \a ns should be not on list at this time, otherwise * this will cause issues related to using freed \a ns in poold -* thread. */ +* thread. +*/ LASSERT (list_empty (&ns->ns_list_chain));kfree (ns);ldlm_put_ref ();
@@ -1050,7 +1060,8 @@ static struct ldlm_resource *ldlm_resource_new(void)lu_ref_init (&res->lr_reference);/* The creator of the resource must unlock the mutex after LVB -* initialization. */ +* initialization. +*/ mutex_init (&res->lr_lvb_mutex);mutex_lock (&res->lr_lvb_mutex);
@@ -1166,7 +1177,8 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,/* Let's see if we happened to be the very first resource in this * namespace. If so, and this is a client namespace, we need to move * the namespace into the active namespaces list to be patrolled by -* the ldlm_poold. */ +* the ldlm_poold. +*/ if (ns_refcount ==1 ) {mutex_lock (ldlm_namespace_lock (LDLM_NAMESPACE_CLIENT ));ldlm_namespace_move_to_active_locked (ns,LDLM_NAMESPACE_CLIENT );
Signature · 1 line
2.1.0
PATCH 47/56 staging/lustre/llite: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/llite/dcache.c | 18 ++- drivers/staging/lustre/lustre/llite/dir.c | 29 ++-- drivers/staging/lustre/lustre/llite/file.c | 161 +++++++++++++-------- drivers/staging/lustre/lustre/llite/llite_close.c | 18 ++- .../staging/lustre/lustre/llite/llite_internal.h | 109 ++++++++------ drivers/staging/lustre/lustre/llite/llite_lib.c | 86 +++++++---- drivers/staging/lustre/lustre/llite/llite_mmap.c | 20 ++- drivers/staging/lustre/lustre/llite/llite_nfs.c | 6 +- drivers/staging/lustre/lustre/llite/lproc_llite.c | 3 +- drivers/staging/lustre/lustre/llite/namei.c | 41 ++++-- drivers/staging/lustre/lustre/llite/rw.c | 70 ++++++--- drivers/staging/lustre/lustre/llite/rw26.c | 21 ++- drivers/staging/lustre/lustre/llite/statahead.c | 36 +++-- drivers/staging/lustre/lustre/llite/super25.c | 6 +- drivers/staging/lustre/lustre/llite/symlink.c | 3 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 42 ++++-- drivers/staging/lustre/lustre/llite/vvp_object.c | 3 +- drivers/staging/lustre/lustre/llite/vvp_page.c | 9 +- drivers/staging/lustre/lustre/llite/xattr.c | 15 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- 20 files changed, 451 insertions(+), 251 deletions(-)
drivers/staging/lustre/lustre/llite/dcache.c +12 -6
@@ -80,7 +80,8 @@ static void ll_release(struct dentry *de)* This avoids a race where ll_lookup_it() instantiates a dentry, but we get * an AST before calling d_revalidate_it(). The dentry still exists (marked * INVALID) so d_lookup() matches it, but we have no lock on it (so -* lock_match() fails) and we spin around real_lookup(). */ +* lock_match() fails) and we spin around real_lookup(). +*/ static int ll_dcompare (const struct dentry *parent,const struct dentry *dentry,unsigned int len,const char *str,const struct qstr *name)
@@ -117,7 +118,8 @@ static inline int return_if_equal(struct ldlm_lock *lock, void *data)/* find any ldlm lock of the inode in mdc and lov * return 0 not find * 1 find one -* < 0 error */ +* < 0 error +*/ static int find_cbdata (struct inode *inode) {struct ll_sb_info *sbi =ll_i2sbi (inode);
@@ -163,10 +165,12 @@ static int ll_ddelete(const struct dentry *de)/* Disable this piece of code temporarily because this is called * inside dcache_lock so it's not appropriate to do lots of work * here. ATTENTION: Before this piece of code enabling, LU-2487 must be -* resolved. */ +* resolved. +*/ #if 0 /* if not ldlm lock for this inode, set i_nlink to 0 so that -* this inode can be recycled later b=20433 */ +* this inode can be recycled later b=20433 +*/ if (d_really_is_positive (de) && !find_cbdata (d_inode (de)))clear_nlink (d_inode (de));#endif
@@ -216,7 +220,8 @@ void ll_intent_drop_lock(struct lookup_intent *it)ldlm_lock_decref (&handle, it->d.lustre.it_lock_mode);/* bug 494: intent_release may be called multiple times, from -* this thread and we don't want to double-decref this lock */ +* this thread and we don't want to double-decref this lock +*/ it->d.lustre.it_lock_mode =0 ;if (it->d.lustre.it_remote_lock_mode !=0 ) { handle.cookie = it->d.lustre.it_remote_lock_handle;
@@ -294,7 +299,8 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct inode *inode)if (it->it_op ==IT_LOOKUP || it->it_op ==IT_GETATTR ) {/* on 2.6 there are situation when several lookups and * revalidations may be requested during single operation. -* therefore, we don't release intent here -bzzz */ +* therefore, we don't release intent here -bzzz +*/ ll_intent_drop_lock (it); } }
drivers/staging/lustre/lustre/llite/dir.c +19 -10
@@ -379,7 +379,8 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash, &it.d.lustre.it_lock_handle, dir, NULL); }else {/* for cross-ref object, l_ast_data of the lock may not be set, -* we reset it here */ +* we reset it here +*/ md_set_lock_data (ll_i2sbi (dir)->ll_md_exp, &lockh.cookie, dir,NULL ); }
@@ -737,8 +738,9 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, }/* In the following we use the fact that LOV_USER_MAGIC_V1 and -LOV_USER_MAGIC_V3 have the same initial fields so we do not -need to make the distinction between the 2 versions */ +* LOV_USER_MAGIC_V3 have the same initial fields so we do not +* need to make the distinction between the 2 versions +*/ if (set_default && mgc->u.cli.cl_mgc_mgsexp) {char *param =NULL ;char *buf;
@@ -929,7 +931,8 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy) }/* Store it the hsm_copy for later copytool use. -* Always modified even if no lsm. */ +* Always modified even if no lsm. +*/ copy->hc_data_version = data_version; }
@@ -1006,11 +1009,13 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy) }/* Store it the hsm_copy for later copytool use. -* Always modified even if no lsm. */ +* Always modified even if no lsm. +*/ hpk.hpk_data_version = data_version;/* File could have been stripped during archiving, so we need -* to check anyway. */ +* to check anyway. +*/ if ((copy->hc_hai.hai_action ==HSMA_ARCHIVE ) && (copy->hc_data_version != data_version)) { CDEBUG(D_HSM, "File data version mismatched. File content was changed during archiving. "
@@ -1022,7 +1027,8 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)* the cdt will loop on retried archive requests. * The policy engine will ask for a new archive later * when the file will not be modified for some tunable -* time */ +* time +*/ /* we do not notify caller */ hpk.hpk_flags &= ~HP_FLAG_RETRY ;/* hpk_errval must be >= 0 */
@@ -1150,7 +1156,8 @@ static int quotactl_ioctl(struct ll_sb_info *sbi, struct if_quotactl *qctl)return rc; }/* If QIF_SPACE is not set, client should collect the -* space usage from OSSs by itself */ +* space usage from OSSs by itself +*/ if (cmd ==Q_GETQUOTA && !(oqctl->qc_dqblk.dqb_valid &QIF_SPACE ) && !oqctl->qc_dqblk.dqb_curspace) {
@@ -1201,7 +1208,8 @@ out:/* This function tries to get a single name component, * to send to the server. No actual path traversal involved, -* so we limit to NAME_MAX */ +* so we limit to NAME_MAX +*/ static char *ll_getname (const char __user *filename) {int ret =0 , len;
@@ -1803,7 +1811,8 @@ out_quotactl: hpk.hpk_data_version =0 ;/* File may not exist in Lustre; all progress -* reported to Lustre root */ +* reported to Lustre root +*/ rc =obd_iocontrol (cmd, sbi->ll_md_exp,sizeof (hpk), &hpk,NULL );return rc;
drivers/staging/lustre/lustre/llite/file.c +103 -58
426 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/llite_close.c +12 -6
@@ -76,7 +76,8 @@ void vvp_write_complete(struct ccc_object *club, struct ccc_page *page)/** Queues DONE_WRITING if * - done writing is allowed; -* - inode has no no dirty pages; */ +* - inode has no no dirty pages; +*/ void ll_queue_done_writing (struct inode *inode,unsigned long flags) {struct ll_inode_info *lli =ll_i2info (inode);
@@ -106,7 +107,8 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags)* close() happen, epoch is closed as the inode is marked as * LLIF_EPOCH_PENDING. When pages are written inode should not * be inserted into the queue again, clear this flag to avoid -* it. */ +* it. +*/ lli->lli_flags &= ~LLIF_DONE_WRITING ;wake_up (&lcq->lcq_waitq);
@@ -147,7 +149,8 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,LASSERT (*och);LASSERT (!lli->lli_pending_och);/* Inode is dirty and there is no pending write done -* request yet, DONE_WRITE is to be sent later. */ +* request yet, DONE_WRITE is to be sent later. +*/ lli->lli_flags |=LLIF_EPOCH_PENDING ; lli->lli_pending_och = *och;spin_unlock (&lli->lli_lock);
@@ -159,7 +162,8 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data,if (flags &LLIF_DONE_WRITING ) {/* Some pages are still dirty, it is early to send * DONE_WRITE. Wait until all pages will be flushed -* and try DONE_WRITE again later. */ +* and try DONE_WRITE again later. +*/ LASSERT (!(lli->lli_flags &LLIF_DONE_WRITING )); lli->lli_flags |=LLIF_DONE_WRITING ;spin_unlock (&lli->lli_lock);
@@ -187,7 +191,8 @@ void ll_ioepoch_close(struct inode *inode, struct md_op_data *op_data, }/* There is a pending DONE_WRITE -- close epoch with no -* attribute change. */ +* attribute change. +*/ if (lli->lli_flags &LLIF_EPOCH_PENDING ) {spin_unlock (&lli->lli_lock); goto out;
@@ -295,7 +300,8 @@ static void ll_done_writing(struct inode *inode) rc =md_done_writing (ll_i2sbi (inode)->ll_md_exp, op_data,NULL );if (rc == -EAGAIN )/* MDS has instructed us to obtain Size-on-MDS attribute from -* OSTs and send setattr to back to MDS. */ +* OSTs and send setattr to back to MDS. +*/ rc =ll_som_update (inode, op_data);else if (rc) CERROR("inode %lu mdc done_writing failed: rc = %d\n",
drivers/staging/lustre/lustre/llite/llite_internal.h +67 -42
231 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/llite_lib.c +57 -29
249 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/llite_mmap.c +12 -8
@@ -151,8 +151,7 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,LASSERT (cio->cui_cl.cis_io == io); -/* mmap lock must be MANDATORY it has to cache -* pages. */ +/* mmap lock must be MANDATORY it has to cache pages. */ io->ci_lockreq =CILR_MANDATORY ; cio->cui_fd = fd; }else {
@@ -199,7 +198,8 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,/* we grab lli_trunc_sem to exclude truncate case. * Otherwise, we could add dirty pages into osc cache -* while truncate is on-going. */ +* while truncate is on-going. +*/ inode =ccc_object_inode (io->ci_obj); lli =ll_i2info (inode);down_read (&lli->lli_trunc_sem);
@@ -220,7 +220,8 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage,/* page was truncated and lock was cancelled, return * ENODATA so that VM_FAULT_NOPAGE will be returned -* to handle_mm_fault(). */ +* to handle_mm_fault(). +*/ if (result ==0 ) result = -ENODATA ; }else if (!PageDirty (vmpage)) {
@@ -313,7 +314,8 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) result =cl_io_loop (env, io);/* ft_flags are only valid if we reached -* the call to filemap_fault */ +* the call to filemap_fault +*/ if (vio->u.fault.fault.ft_flags_valid) fault_ret = vio->u.fault.fault.ft_flags;
@@ -342,9 +344,10 @@ static int ll_fault(struct vm_area_struct *vma, struct vm_fault *vmf)int result;sigset_t set; -/* Only SIGKILL and SIGTERM is allowed for fault/nopage/mkwrite +/* Only SIGKILL and SIGTERM are allowed for fault/nopage/mkwrite * so that it can be killed by admin but not cause segfault by -* other signals. */ +* other signals. +*/ set =cfs_block_sigsinv (sigmask (SIGKILL ) |sigmask (SIGTERM )); restart:
@@ -445,7 +448,8 @@ static void ll_vm_close(struct vm_area_struct *vma) }/* XXX put nice comment here. talk about __free_pte -> dirty pages and -* nopage's reference passing to the pte */ +* nopage's reference passing to the pte +*/ int ll_teardown_mmaps (struct address_space *mapping,__u64 first,__u64 last) {int rc = -ENOENT ;
drivers/staging/lustre/lustre/llite/llite_nfs.c +4 -2
@@ -105,7 +105,8 @@ struct inode *search_inode_for_lustre(struct super_block *sb,return ERR_PTR (rc);/* Because inode is NULL, ll_prep_md_op_data can not -* be used here. So we allocate op_data ourselves */ +* be used here. So we allocate op_data ourselves +*/ op_data =kzalloc (sizeof (*op_data),GFP_NOFS );if (!op_data)return ERR_PTR (-ENOMEM );
@@ -213,7 +214,8 @@ static int ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name, unsigned type) {/* It is hack to access lde_fid for comparison with lgd_fid. -* So the input 'name' must be part of the 'lu_dirent'. */ +* So the input 'name' must be part of the 'lu_dirent'. +*/ struct lu_dirent *lde = container_of0(name, struct lu_dirent, lde_name);struct ll_getname_data *lgd = container_of(ctx, struct ll_getname_data, ctx);
drivers/staging/lustre/lustre/llite/lproc_llite.c +2 -1
@@ -345,7 +345,8 @@ static ssize_t max_read_ahead_whole_mb_store(struct kobject *kobj,return rc;/* Cap this at the current max readahead window size, the readahead -* algorithm does this anyway so it's pointless to set it larger. */ +* algorithm does this anyway so it's pointless to set it larger. +*/ if (pages_number > sbi->ll_ra_info.ra_max_pages_per_file) {CERROR ("can't set max_read_ahead_whole_mb more than max_read_ahead_per_file_mb: %lu\n" , sbi->ll_ra_info.ra_max_pages_per_file >> (20 -PAGE_CACHE_SHIFT ));
drivers/staging/lustre/lustre/llite/namei.c +25 -16
95 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/rw.c +46 -24
204 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/rw26.c +14 -7
@@ -145,7 +145,8 @@ static int ll_releasepage(struct page *vmpage, RELEASEPAGE_ARG_TYPE gfp_mask)/* If we can't allocate an env we won't call cl_page_put() * later on which further means it's impossible to drop * page refcount by cl_page, so ask kernel to not free -* this page. */ +* this page. +*/ return 0 ; page =cl_vmpage_page (vmpage, obj);
@@ -212,7 +213,8 @@ static inline int ll_get_user_pages(int rw, unsigned long user_addr, }/* ll_free_user_pages - tear down page struct array -* @pages: array of page struct pointers underlying target buffer */ +* @pages: array of page struct pointers underlying target buffer +*/ static void ll_free_user_pages (struct page **pages,int npages,int do_dirty) {int i;
@@ -266,7 +268,8 @@ ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io, do_io = true;/* check the page type: if the page is a host page, then do -* write directly */ +* write directly +*/ if (clp->cp_type ==CPT_CACHEABLE ) {struct page *vmpage =cl_page_vmpage (env, clp);struct page *src_page;
@@ -284,14 +287,16 @@ ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,kunmap_atomic (src);/* make sure page will be added to the transfer by -* cl_io_submit()->...->vvp_page_prep_write(). */ +* cl_io_submit()->...->vvp_page_prep_write(). +*/ if (rw ==WRITE )set_page_dirty (vmpage);if (rw ==READ ) {/* do not issue the page for read, since it * may reread a ra page which has NOT uptodate -* bit set. */ +* bit set. +*/ cl_page_disown (env, io, clp); do_io = false; }
@@ -359,7 +364,8 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,* kmalloc limit. We need to fit all of the brw_page structs, each one * representing PAGE_SIZE worth of user data, into a single buffer, and * then truncate this to be a full-sized RPC. For 4kB PAGE_SIZE this is -* up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. */ +* up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. +*/ #define MAX_DIO_SIZE ((MAX_MALLOC / sizeof(struct brw_page) * PAGE_CACHE_SIZE) & \ ~(DT_MAX_BRW_SIZE - 1)) static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,
@@ -433,7 +439,8 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,* for the request, shrink it to a smaller * PAGE_SIZE multiple and try again. * We should always be able to kmalloc for a -* page worth of page pointers = 4MB on i386. */ +* page worth of page pointers = 4MB on i386. +*/ if (result == -ENOMEM && size > (PAGE_CACHE_SIZE /sizeof (*pages)) *PAGE_CACHE_SIZE ) {
drivers/staging/lustre/lustre/llite/statahead.c +24 -12
@@ -494,7 +494,8 @@ static void ll_sai_put(struct ll_statahead_info *sai)if (unlikely (atomic_read (&sai->sai_refcount) >0 )) {/* It is race case, the interpret callback just hold -* a reference count */ +* a reference count +*/ spin_unlock (&lli->lli_sa_lock);return ; }
@@ -631,7 +632,8 @@ static void ll_post_statahead(struct ll_statahead_info *sai)LASSERT (fid_is_zero (&minfo->mi_data.op_fid2));/* XXX: No fid in reply, this is probably cross-ref case. -* SA can't handle it yet. */ +* SA can't handle it yet. +*/ if (body->valid &OBD_MD_MDS ) { rc = -EAGAIN ; goto out;
@@ -672,7 +674,8 @@ out:/* The "ll_sa_entry_to_stated()" will drop related ldlm ibits lock * reference count by calling "ll_intent_drop_lock()" in spite of the * above operations failed or not. Do not worry about calling -* "ll_intent_drop_lock()" more than once. */ +* "ll_intent_drop_lock()" more than once. +*/ rc =ll_sa_entry_to_stated (sai, entry, rc <0 ?SA_ENTRY_INVA :SA_ENTRY_SUCC );if (rc ==0 && entry->se_index == sai->sai_index_wait)
@@ -698,7 +701,8 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,/* release ibits lock ASAP to avoid deadlock when statahead * thread enqueues lock on parent in readdir and another * process enqueues lock on child with parent lock held, eg. -* unlink. */ +* unlink. +*/ handle = it->d.lustre.it_lock_handle;ll_intent_drop_lock (it); }
@@ -736,7 +740,8 @@ static int ll_statahead_interpret(struct ptlrpc_request *req,/* Release the async ibits lock ASAP to avoid deadlock * when statahead thread tries to enqueue lock on parent * for readpage and other tries to enqueue lock on child -* with parent's lock held, for example: unlink. */ +* with parent's lock held, for example: unlink. +*/ entry->se_handle = handle; wakeup =list_empty (&sai->sai_entries_received); list_add_tail(&entry->se_list,
@@ -947,7 +952,8 @@ static int ll_agl_thread(void *arg)if (thread_is_init (thread))/* If someone else has changed the thread state * (e.g. already changed to SVC_STOPPING), we can't just -* blindly overwrite that setting. */ +* blindly overwrite that setting. +*/ thread_set_flags (thread,SVC_RUNNING );spin_unlock (&plli->lli_agl_lock);wake_up (&thread->t_ctl_waitq);
@@ -963,7 +969,8 @@ static int ll_agl_thread(void *arg)spin_lock (&plli->lli_agl_lock);/* The statahead thread maybe help to process AGL entries, -* so check whether list empty again. */ +* so check whether list empty again. +*/ if (!list_empty (&sai->sai_entries_agl)) { clli =list_entry (sai->sai_entries_agl.next, struct ll_inode_info, lli_agl_list);
@@ -1048,7 +1055,8 @@ static int ll_statahead_thread(void *arg)if (thread_is_init (thread))/* If someone else has changed the thread state * (e.g. already changed to SVC_STOPPING), we can't just -* blindly overwrite that setting. */ +* blindly overwrite that setting. +*/ thread_set_flags (thread,SVC_RUNNING );spin_unlock (&plli->lli_sa_lock);wake_up (&thread->t_ctl_waitq);
@@ -1136,7 +1144,8 @@ interpret_it:/* If no window for metadata statahead, but there are * some AGL entries to be triggered, then try to help -* to process the AGL entries. */ +* to process the AGL entries. +*/ if (sa_sent_full (sai)) {spin_lock (&plli->lli_agl_lock);while (!list_empty (&sai->sai_entries_agl)) {
@@ -1364,7 +1373,8 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) hash =le64_to_cpu (ent->lde_hash);/* The ll_get_dir_page() can return any page containing -* the given hash which may be not the start hash. */ +* the given hash which may be not the start hash. +*/ if (unlikely (hash < pos))continue ;
@@ -1650,7 +1660,8 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,* but as soon as we expose the sai by attaching it to the lli that * default reference can be dropped by another thread calling * ll_stop_statahead. We need to take a local reference to protect -* the sai buffer while we intend to access it. */ +* the sai buffer while we intend to access it. +*/ ll_sai_get (sai); lli->lli_sai = sai;
@@ -1666,7 +1677,8 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp,thread_set_flags (thread,SVC_STOPPED );thread_set_flags (&sai->sai_agl_thread,SVC_STOPPED );/* Drop both our own local reference and the default -* reference from allocation time. */ +* reference from allocation time. +*/ ll_sai_put (sai);ll_sai_put (sai);LASSERT (!lli->lli_sai);
drivers/staging/lustre/lustre/llite/super25.c +4 -2
@@ -99,7 +99,8 @@ static int __init init_lustre_lite(void)/* print an address of _any_ initialized kernel symbol from this * module, to allow debugging with gdb that doesn't support data -* symbols from modules.*/ +* symbols from modules. +*/ CDEBUG (D_INFO ,"Lustre client module (%p).\n" , &lustre_super_operations);
@@ -146,7 +147,8 @@ static int __init init_lustre_lite(void)cfs_get_random_bytes (seed,sizeof (seed));/* Nodes with small feet have little entropy. The NID for this -* node gives the most entropy in the low bits */ +* node gives the most entropy in the low bits +*/ for (i =0 ;; i++) {if (LNetGetId (i, &lnet_id) == -ENOENT )break ;
drivers/staging/lustre/lustre/llite/symlink.c +2 -1
@@ -59,7 +59,8 @@ static int ll_readlink_internal(struct inode *inode, *symname = lli->lli_symlink_name;/* If the total CDEBUG() size is larger than a page, it * will print a warning to the console, avoid this by -* printing just the last part of the symlink. */ +* printing just the last part of the symlink. +*/ CDEBUG (D_INODE ,"using cached symlink %s%.*s, len = %d\n" , print_limit < symlen ?"..." :"" , print_limit, (*symname) + symlen - print_limit, symlen);
drivers/staging/lustre/lustre/llite/vvp_io.c +27 -15
124 lines not on this page · raw message
drivers/staging/lustre/lustre/llite/vvp_object.c +2 -1
@@ -137,7 +137,8 @@ static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,* page may be stale due to layout change, and the process * will never be notified. * This operation is expensive but mmap processes have to pay -* a price themselves. */ +* a price themselves. +*/ unmap_mapping_range (conf->coc_inode->i_mapping,0 ,OBD_OBJECT_EOF ,0 );
drivers/staging/lustre/lustre/llite/vvp_page.c +5 -4
@@ -232,7 +232,8 @@ static int vvp_page_prep_write(const struct lu_env *env,LASSERT (!PageDirty (vmpage));/* ll_writepage path is not a sync write, so need to set page writeback -* flag */ +* flag +*/ if (!pg->cp_sync_io)set_page_writeback (vmpage);
@@ -356,15 +357,15 @@ static int vvp_page_make_ready(const struct lu_env *env,lock_page (vmpage);if (clear_page_dirty_for_io (vmpage)) {LASSERT (pg->cp_state ==CPS_CACHED ); -/* This actually clears the dirty bit in the radix -* tree. */ +/* This actually clears the dirty bit in the radix tree. */ set_page_writeback (vmpage);vvp_write_pending (cl2ccc (slice->cpl_obj),cl2ccc_page (slice));CL_PAGE_HEADER (D_PAGE , env, pg,"readied\n" ); }else if (pg->cp_state ==CPS_PAGEOUT ) {/* is it possible for osc_flush_async_page() to already -* make it ready? */ +* make it ready? +*/ result = -EALREADY ; }else { CL_PAGE_DEBUG(D_ERROR, env, pg, "Unexpecting page state %d.\n",
drivers/staging/lustre/lustre/llite/xattr.c +10 -5
@@ -237,7 +237,8 @@ int ll_setxattr(struct dentry *dentry, const char *name,/* Attributes that are saved via getxattr will always have * the stripe_offset as 0. Instead, the MDS should be -* allowed to pick the starting OST index. b=17846 */ +* allowed to pick the starting OST index. b=17846 +*/ if (lump && lump->lmm_stripe_offset ==0 ) lump->lmm_stripe_offset =-1 ;
@@ -480,7 +481,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,if (size ==0 &&S_ISDIR (inode->i_mode)) {/* XXX directory EA is fix for now, optimize to save -* RPC transfer */ +* RPC transfer +*/ rc =sizeof (struct lov_user_md ); goto out; }
@@ -495,7 +497,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name, } }else {/* LSM is present already after lookup/getattr call. -* we need to grab layout lock once it is implemented */ +* we need to grab layout lock once it is implemented +*/ rc =obd_packmd (ll_i2dtexp (inode), &lmm, lsm); lmmsize = rc; }
@@ -508,7 +511,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,/* used to call ll_get_max_mdsize() forward to get * the maximum buffer size, while some apps (such as * rsync 3.0.x) care much about the exact xattr value -* size */ +* size +*/ rc = lmmsize; goto out; }
@@ -524,7 +528,8 @@ ssize_t ll_getxattr(struct dentry *dentry, const char *name,memcpy (lump, lmm, lmmsize);/* do not return layout gen for getxattr otherwise it would * confuse tar --xattr by recognizing layout gen as stripe -* offset when the file is restored. See LU-2809. */ +* offset when the file is restored. See LU-2809. +*/ lump->lmm_layout_gen =0 ; rc = lmmsize;
drivers/staging/lustre/lustre/llite/xattr_cache.c +4 -2
@@ -23,7 +23,8 @@*/ struct ll_xattr_entry {struct list_head xe_list;/* protected with -* lli_xattrs_list_rwsem */ +* lli_xattrs_list_rwsem +*/ char *xe_name;/* xattr name, \0-terminated */ char *xe_value;/* xattr value */ unsigned xe_namelen;/* strlen(xe_name) + 1 */
@@ -280,7 +281,8 @@ static int ll_xattr_find_get_lock(struct inode *inode,mutex_lock (&lli->lli_xattrs_enq_lock);/* inode may have been shrunk and recreated, so data is gone, match lock -* only when data exists. */ +* only when data exists. +*/ if (ll_xattr_cache_valid (lli)) {/* Try matching first. */ mode = ll_take_md_lock(inode, MDS_INODELOCK_XATTR, &lockh, 0,
Signature · 1 line
2.1.0
PATCH 48/56 staging/lustre/lmv: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/lmv/lmv_fld.c | 3 ++- drivers/staging/lustre/lustre/lmv/lmv_intent.c | 9 ++++--- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 37 +++++++++++++++++--------- 3 files changed, 32 insertions(+), 17 deletions(-)
drivers/staging/lustre/lustre/lmv/lmv_fld.c +2 -1
@@ -58,7 +58,8 @@ int lmv_fld_lookup(struct lmv_obd *lmv,int rc;/* FIXME: Currently ZFS still use local seq for ROOT unfortunately, and -* this fid_is_local check should be removed once LU-2240 is fixed */ +* this fid_is_local check should be removed once LU-2240 is fixed +*/ LASSERTF ((fid_seq_in_fldb (fid_seq (fid)) ||fid_seq_is_local_file (fid_seq (fid))) &&fid_is_sane (fid),DFID " is insane!\n" ,PFID (fid));
drivers/staging/lustre/lustre/lmv/lmv_intent.c +6 -3
@@ -110,11 +110,13 @@ static int lmv_intent_remote(struct obd_export *exp, void *lmm,if (parent_fid) {/* The parent fid is only for remote open to * check whether the open is from OBF, -* see mdt_cross_open */ +* see mdt_cross_open +*/ LASSERT (it->it_op &IT_OPEN ); op_data->op_fid2 = *parent_fid;/* Add object FID to op_fid3, in case it needs to check stale -* (M_CHECK_STALE), see mdc_finish_intent_lock */ +* (M_CHECK_STALE), see mdc_finish_intent_lock +*/ op_data->op_fid3 = body->fid1; }
@@ -173,7 +175,8 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,return PTR_ERR (tgt);/* If it is ready to open the file by FID, do not need -* allocate FID at all, otherwise it will confuse MDT */ +* allocate FID at all, otherwise it will confuse MDT +*/ if ((it->it_op &IT_CREAT ) && !(it->it_flags &MDS_OPEN_BY_FID )) {/*
drivers/staging/lustre/lustre/lmv/lmv_obd.c +24 -13
@@ -679,7 +679,8 @@ repeat_fid2path: goto out_fid2path;/* If remote_gf != NULL, it means just building the -* path on the remote MDT, copy this path segment to gf */ +* path on the remote MDT, copy this path segment to gf +*/ if (remote_gf) {struct getinfo_fid2path *ori_gf;char *ptr;
@@ -797,7 +798,8 @@ static int lmv_hsm_ct_unregister(struct lmv_obd *lmv, unsigned int cmd, int len,/* unregister request (call from llapi_hsm_copytool_fini) */ for (i =0 ; i < lmv->desc.ld_tgt_count; i++) {/* best effort: try to clean as much as possible -* (continue on error) */ +* (continue on error) +*/ obd_iocontrol (cmd, lmv->tgts[i]->ltd_exp, len, lk, uarg); }
@@ -821,7 +823,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,/* All or nothing: try to register to all MDS. * In case of failure, unregister from previous MDS, -* except if it because of inactive target. */ +* except if it because of inactive target. +*/ for (i =0 ; i < lmv->desc.ld_tgt_count; i++) { err =obd_iocontrol (cmd, lmv->tgts[i]->ltd_exp, len, lk, uarg);
@@ -841,8 +844,8 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,return rc; }/* else: transient error. -* kuc will register to the missing MDT -* when it is back */ +* kuc will register to the missing MDT when it is back +*/ }else { any_set = true; }
@@ -1028,7 +1031,8 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,/* if the request is about a single fid * or if there is a single MDS, no need to split -* the request. */ +* the request. +*/ if (reqcount ==1 || count ==1 ) { tgt =lmv_find_target (lmv, &hur->hur_user_item[0 ].hui_fid);
@@ -1104,7 +1108,8 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,if (!lmv->tgts[i] || !lmv->tgts[i]->ltd_exp)continue ;/* ll_umount_begin() sets force flag but for lmv, not -* mdc. Let's pass it through */ +* mdc. Let's pass it through +*/ mdc_obd =class_exp2obd (lmv->tgts[i]->ltd_exp); mdc_obd->obd_force = obddev->obd_force; err = obd_iocontrol(cmd, lmv->tgts[i]->ltd_exp, len,
@@ -1211,7 +1216,8 @@ static int lmv_placement_policy(struct obd_device *obd, }/* Allocate new fid on target according to operation type and parent -* home mds. */ +* home mds. +*/ *mds = op_data->op_mds;return 0 ; }
@@ -1363,7 +1369,8 @@ static int lmv_process_config(struct obd_device *obd, u32 len, void *buf)switch (lcfg->lcfg_command) {case LCFG_ADD_MDC :/* modify_mdc_tgts add 0:lustre-clilmv 1:lustre-MDT0000_UUID -* 2:0 3:1 4:lustre-MDT0000-mdc_UUID */ +* 2:0 3:1 4:lustre-MDT0000-mdc_UUID +*/ if (LUSTRE_CFG_BUFLEN (lcfg,1 ) >sizeof (obd_uuid.uuid)) { rc = -EINVAL ; goto out;
@@ -1427,7 +1434,8 @@ static int lmv_statfs(const struct lu_env *env, struct obd_export *exp,* i.e. mount does not need the merged osfs * from all of MDT. * And also clients can be mounted as long as -* MDT0 is in service*/ +* MDT0 is in service +*/ if (flags &OBD_STATFS_FOR_MDT0 ) goto out_free_temp; }else {
@@ -2122,7 +2130,8 @@ static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs)break ;/* Enlarge the end entry lde_reclen from 0 to -* first entry of next lu_dirpage. */ +* first entry of next lu_dirpage. +*/ LASSERT (le16_to_cpu (end_dirent->lde_reclen) ==0 ); end_dirent->lde_reclen = cpu_to_le16((char *)(dp->ldp_entries) -
@@ -2260,7 +2269,8 @@ retry:* 4. Then A will resend unlink RPC to MDT0. (retry 2nd times). * * In theory, it might try unlimited time here, but it should -* be very rare case. */ +* be very rare case. +*/ op_data->op_fid2 = body->fid1;ptlrpc_req_finished (*request); *request =NULL ;
@@ -2275,7 +2285,8 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)switch (stage) {case OBD_CLEANUP_EARLY :/* XXX: here should be calling obd_precleanup() down to -* stack. */ +* stack. +*/ break ;case OBD_CLEANUP_EXPORTS :fld_client_debugfs_fini (&lmv->lmv_fld);
Signature · 1 line
2.1.0
PATCH 49/56 staging/lustre/lov: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch.
--- drivers/staging/lustre/lustre/lov/lov_ea.c | 3 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 6 +- drivers/staging/lustre/lustre/lov/lov_lock.c | 32 ++++++---- drivers/staging/lustre/lustre/lov/lov_obd.c | 78 ++++++++++++++++-------- drivers/staging/lustre/lustre/lov/lov_object.c | 24 +++++--- drivers/staging/lustre/lustre/lov/lov_offset.c | 12 ++-- drivers/staging/lustre/lustre/lov/lov_pack.c | 12 ++-- drivers/staging/lustre/lustre/lov/lov_pool.c | 12 ++-- drivers/staging/lustre/lustre/lov/lov_request.c | 18 ++++-- drivers/staging/lustre/lustre/lov/lovsub_lock.c | 6 +- 10 files changed, 134 insertions(+), 69 deletions(-)
drivers/staging/lustre/lustre/lov/lov_ea.c +2 -1
@@ -162,7 +162,8 @@ static int lsm_destroy_plain(struct lov_stripe_md *lsm, struct obdo *oa, }/* Find minimum stripe maxbytes value. For inactive or -* reconnecting targets use LUSTRE_STRIPE_MAXBYTES. */ +* reconnecting targets use LUSTRE_STRIPE_MAXBYTES. +*/ static void lov_tgt_maxbytes (struct lov_tgt_desc *tgt,__u64 *stripe_maxbytes) {struct obd_import *imp = tgt->ltd_obd->u.cli.cl_import;
drivers/staging/lustre/lustre/lov/lov_internal.h +4 -2
@@ -43,7 +43,8 @@/* lov_do_div64(a, b) returns a % b, and a = a / b. * The 32-bit code is LOV-specific due to knowing about stripe limits in * order to reduce the divisor to a 32-bit number. If the divisor is -* already a 32-bit value the compiler handles this directly. */ +* already a 32-bit value the compiler handles this directly. +*/ #if BITS_PER_LONG ==64 # define lov_do_div64 (n, base) ({ \ uint64_t __base = (base); \
@@ -92,7 +93,8 @@ struct lov_request_set {atomic_t set_refcount;struct obd_export *set_exp;/* XXX: There is @set_exp already, however obd_statfs gets obd_device -only. */ +* only. +*/ struct obd_device *set_obd;int set_count;atomic_t set_completes;
drivers/staging/lustre/lustre/lov/lov_lock.c +21 -11
@@ -160,7 +160,8 @@ static struct cl_lock *lov_sublock_alloc(const struct lu_env *env,* to remember the subio. This is because lock is able * to be cached, but this is not true for IO. This * further means a sublock might be referenced in -* different io context. -jay */ +* different io context. -jay +*/ sublock =cl_lock_hold (subenv->lse_env, subenv->lse_io, descr,"lov-parent" , parent);
@@ -477,7 +478,8 @@ static int lov_lock_enqueue_one(const struct lu_env *env, struct lov_lock *lck, result =cl_enqueue_try (env, sublock, io, enqflags);if ((sublock->cll_state ==CLS_ENQUEUED ) && !(enqflags &CEF_AGL )) {/* if it is enqueued, try to `wait' on it---maybe it's already -* granted */ +* granted +*/ result =cl_wait_try (env, sublock);if (result ==CLO_REENQUEUED ) result =CLO_WAIT ;
@@ -518,7 +520,8 @@ static int lov_sublock_fill(const struct lu_env *env, struct cl_lock *parent, }else {kmem_cache_free (lov_lock_link_kmem, link);/* other thread allocated sub-lock, or enqueue is no -* longer going on */ +* longer going on +*/ cl_lock_mutex_put (env, parent);cl_lock_unhold (env, sublock,"lov-parent" , parent);cl_lock_mutex_get (env, parent);
@@ -575,7 +578,8 @@ static int lov_lock_enqueue(const struct lu_env *env,if (!sub) { result =lov_sublock_fill (env, lock, io, lck, i);/* lov_sublock_fill() released @lock mutex, -* restart. */ +* restart. +*/ break ; } sublock = sub->lss_cl.cls_lock;
@@ -603,7 +607,8 @@ static int lov_lock_enqueue(const struct lu_env *env,/* take recursive mutex of sublock */ cl_lock_mutex_get (env, sublock);/* need to release all locks in closure -* otherwise it may deadlock. LU-2683.*/ +* otherwise it may deadlock. LU-2683. +*/ lov_sublock_unlock (env, sub, closure, subenv);/* sublock and parent are held. */
@@ -647,7 +652,8 @@ static int lov_lock_unuse(const struct lu_env *env,/* top-lock state cannot change concurrently, because single * thread (one that released the last hold) carries unlocking -* to the completion. */ +* to the completion. +*/ LASSERT (slice->cls_lock->cll_state ==CLS_INTRANSIT ); lls = &lck->lls_sub[i]; sub = lls->sub_lock;
@@ -693,7 +699,8 @@ static void lov_lock_cancel(const struct lu_env *env,/* top-lock state cannot change concurrently, because single * thread (one that released the last hold) carries unlocking -* to the completion. */ +* to the completion. +*/ lls = &lck->lls_sub[i]; sub = lls->sub_lock;if (!sub)
@@ -773,8 +780,9 @@ again:if (result !=0 )break ; } -/* Each sublock only can be reenqueued once, so will not loop for -* ever. */ +/* Each sublock only can be reenqueued once, so will not loop +* forever. +*/ if (result ==0 && reenqueued !=0 ) goto again;cl_lock_closure_fini (closure);
@@ -823,7 +831,8 @@ static int lov_lock_use(const struct lu_env *env, i, 1, rc); }else if (sublock->cll_state ==CLS_NEW ) {/* Sub-lock might have been canceled, while -* top-lock was cached. */ +* top-lock was cached. +*/ result = -ESTALE ;lov_sublock_release (env, lck, i,1 , result); }
@@ -928,7 +937,8 @@ static int lov_lock_fits_into(const struct lu_env *env,LASSERT (lov->lls_nr >0 );/* for top lock, it's necessary to match enq flags otherwise it will -* run into problem if a sublock is missing and reenqueue. */ +* run into problem if a sublock is missing and reenqueue. +*/ if (need->cld_enq_flags != lov->lls_orig.cld_enq_flags)return 0 ;
drivers/staging/lustre/lustre/lov/lov_obd.c +51 -27
218 lines not on this page · raw message
drivers/staging/lustre/lustre/lov/lov_object.c +16 -8
@@ -135,7 +135,8 @@ static int lov_init_sub(const struct lu_env *env, struct lov_object *lov,* Do not leave the object in cache to avoid accessing * freed memory. This is because osc_object is referring to * lov_oinfo of lsm_stripe_data which will be freed due to -* this failure. */ +* this failure. +*/ cl_object_kill (env, stripe);cl_object_put (env, stripe);return -EIO ;
@@ -174,7 +175,8 @@ static int lov_init_sub(const struct lu_env *env, struct lov_object *lov, old_lov =cl2lov (lu2cl (old_obj));if (old_lov->lo_layout_invalid) {/* the object's layout has already changed but isn't -* refreshed */ +* refreshed +*/ lu_object_unhash (env, &stripe->co_lu); result = -EAGAIN ; }else {
@@ -243,7 +245,8 @@ static int lov_init_raid0(const struct lu_env *env, subconf->u.coc_oinfo = oinfo;LASSERTF (subdev,"not init ost %d\n" , ost_idx);/* In the function below, .hs_keycmp resolves to -* lu_obj_hop_keycmp() */ +* lu_obj_hop_keycmp() +*/ /* coverity[overrun-buffer-val] */ stripe =lov_sub_find (env, subdev, ofid, subconf);if (!IS_ERR (stripe)) {
@@ -310,7 +313,8 @@ static void lov_subobject_kill(const struct lu_env *env, struct lov_object *lov,cl_object_put (env, sub);/* ... wait until it is actually destroyed---sub-object clears its -* ->lo_sub[] slot in lovsub_object_fini() */ +* ->lo_sub[] slot in lovsub_object_fini() +*/ if (r0->lo_sub[idx] == los) { waiter = &lov_env_info (env)->lti_waiter;init_waitqueue_entry (waiter, current);
@@ -318,7 +322,8 @@ static void lov_subobject_kill(const struct lu_env *env, struct lov_object *lov,set_current_state (TASK_UNINTERRUPTIBLE );while (1 ) {/* this wait-queue is signaled at the end of -* lu_object_free(). */ +* lu_object_free(). +*/ set_current_state (TASK_UNINTERRUPTIBLE );spin_lock (&r0->lo_sub_lock);if (r0->lo_sub[idx] == los) {
@@ -465,7 +470,8 @@ static int lov_attr_get_raid0(const struct lu_env *env, struct cl_object *obj,* context, and this function is called in ccc_lock_state(), it will * hit this assertion. * Anyway, it's still okay to call attr_get w/o type guard as layout -* can't go if locks exist. */ +* can't go if locks exist. +*/ /* LASSERT(atomic_read(&lsm->lsm_refc) > 1); */ if (!r0->lo_attr_valid) {
@@ -475,7 +481,8 @@ static int lov_attr_get_raid0(const struct lu_env *env, struct cl_object *obj,memset (lvb,0 ,sizeof (*lvb));/* XXX: timestamps can be negative by sanity:test_39m, -* how can it be? */ +* how can it be? +*/ lvb->lvb_atime =LLONG_MIN ; lvb->lvb_ctime =LLONG_MIN ; lvb->lvb_mtime =LLONG_MIN ;
@@ -845,7 +852,8 @@ static int lov_attr_get(const struct lu_env *env, struct cl_object *obj, struct cl_attr *attr) {/* do not take lock, as this function is called under a -* spin-lock. Layout is protected from changing by ongoing IO. */ +* spin-lock. Layout is protected from changing by ongoing IO. +*/ return LOV_2DISPATCH_NOLOCK (cl2lov (obj), llo_getattr, env, obj, attr); }
drivers/staging/lustre/lustre/lov/lov_offset.c +8 -4
@@ -114,7 +114,8 @@ u64 lov_stripe_size(struct lov_stripe_md *lsm, u64 ost_size,* this function returns < 0 when the offset was "before" the stripe and * was moved forward to the start of the stripe in question; 0 when it * falls in the stripe and no shifting was done; > 0 when the offset -* was outside the stripe and was pulled back to its final byte. */ +* was outside the stripe and was pulled back to its final byte. +*/ int lov_stripe_offset (struct lov_stripe_md *lsm,u64 lov_off,int stripeno,u64 *obdoff) {
@@ -209,7 +210,8 @@ u64 lov_size_to_stripe(struct lov_stripe_md *lsm, u64 file_size,/* given an extent in an lov and a stripe, calculate the extent of the stripe * that is contained within the lov extent. this returns true if the given -* stripe does intersect with the lov extent. */ +* stripe does intersect with the lov extent. +*/ int lov_stripe_intersects (struct lov_stripe_md *lsm,int stripeno,u64 start,u64 end,u64 *obd_start,u64 *obd_end) {
@@ -223,7 +225,8 @@ int lov_stripe_intersects(struct lov_stripe_md *lsm, int stripeno,/* this stripe doesn't intersect the file extent when neither * start or the end intersected the stripe and obd_start and -* obd_end got rounded up to the save value. */ +* obd_end got rounded up to the save value. +*/ if (start_side !=0 && end_side !=0 && *obd_start == *obd_end)return 0 ;
@@ -234,7 +237,8 @@ int lov_stripe_intersects(struct lov_stripe_md *lsm, int stripeno,* in the wrong direction and touch it up. * interestingly, this can't underflow since end must be > start * if we passed through the previous check. -* (should we assert for that somewhere?) */ +* (should we assert for that somewhere?) +*/ if (end_side !=0 ) (*obd_end)--;
drivers/staging/lustre/lustre/lov/lov_pack.c +8 -4
@@ -141,7 +141,8 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,if (lsm) {/* If we are just sizing the EA, limit the stripe count -* to the actual number of OSTs in this filesystem. */ +* to the actual number of OSTs in this filesystem. +*/ if (!lmmp) { stripe_count =lov_get_stripecnt (lov, lmm_magic, lsm->lsm_stripe_count);
@@ -155,7 +156,8 @@ int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,/* No need to allocate more than maximum supported stripes. * Anyway, this is pretty inaccurate since ld_tgt_count now * represents max index and we should rely on the actual number -* of OSTs instead */ +* of OSTs instead +*/ stripe_count =lov_mds_md_max_stripe_count ( lov->lov_ocd.ocd_max_easize, lmm_magic);
@@ -241,7 +243,8 @@ __u16 lov_get_stripecnt(struct lov_obd *lov, __u32 magic, __u16 stripe_count) stripe_count =1 ;/* stripe count is based on whether ldiskfs can handle -* larger EA sizes */ +* larger EA sizes +*/ if (lov->lov_ocd.ocd_connect_flags &OBD_CONNECT_MAX_EASIZE && lov->lov_ocd.ocd_max_easize) max_stripes = lov_mds_md_max_stripe_count(
@@ -397,7 +400,8 @@ int lov_getstripe(struct obd_export *exp, struct lov_stripe_md *lsm,set_fs (KERNEL_DS );/* we only need the header part from user space to get lmm_magic and -* lmm_stripe_count, (the header part is common to v1 and v3) */ +* lmm_stripe_count, (the header part is common to v1 and v3) +*/ lum_size =sizeof (struct lov_user_md_v1 );if (copy_from_user (&lum, lump, lum_size)) { rc = -EFAULT ;
drivers/staging/lustre/lustre/lov/lov_pool.c +8 -4
@@ -204,7 +204,8 @@ static void *pool_proc_start(struct seq_file *s, loff_t *pos)if ((pool_tgt_count (pool) ==0 ) || (*pos >=pool_tgt_count (pool))) {/* iter is not created, so stop() has no way to -* find pool to dec ref */ +* find pool to dec ref +*/ lov_pool_putref (pool);return NULL ; }
@@ -217,7 +218,8 @@ static void *pool_proc_start(struct seq_file *s, loff_t *pos) iter->idx =0 ;/* we use seq_file private field to memorized iterator so -* we can free it at stop() */ +* we can free it at stop() +*/ /* /!\ do not forget to restore it to pool before freeing it */ s->private = iter;if (*pos >0 ) {
@@ -239,10 +241,12 @@ static void pool_proc_stop(struct seq_file *s, void *v)/* in some cases stop() method is called 2 times, without * calling start() method (see seq_read() from fs/seq_file.c) -* we have to free only if s->private is an iterator */ +* we have to free only if s->private is an iterator +*/ if ((iter) && (iter->magic ==POOL_IT_MAGIC )) {/* we restore s->private so next call to pool_proc_start() -* will work */ +* will work +*/ s->private = iter->pool;lov_pool_putref (iter->pool);kfree (iter);
drivers/staging/lustre/lustre/lov/lov_request.c +12 -6
@@ -225,7 +225,8 @@ static int common_attr_done(struct lov_request_set *set)if ((set->set_oi->oi_oa->o_valid &OBD_MD_FLEPOCH ) && (set->set_oi->oi_md->lsm_stripe_count != attrset)) {/* When we take attributes of some epoch, we require all the -* ost to be active. */ +* ost to be active. +*/ CERROR ("Not all the stripes had valid attrs\n" ); rc = -EIO ; goto out;
@@ -256,7 +257,8 @@ int lov_fini_getattr_set(struct lov_request_set *set) }/* The callback for osc_getattr_async that finalizes a request info when a -* response is received. */ +* response is received. +*/ static int cb_getattr_update (void *cookie,int rc) {struct obd_info *oinfo = cookie;
@@ -458,7 +460,8 @@ int lov_update_setattr_set(struct lov_request_set *set, }/* The callback for osc_setattr_async that finalizes a request info when a -* response is received. */ +* response is received. +*/ static int cb_setattr_update (void *cookie,int rc) {struct obd_info *oinfo = cookie;
@@ -646,7 +649,8 @@ static void lov_update_statfs(struct obd_statfs *osfs, }/* The callback for osc_statfs_async that finalizes a request info when a -* response is received. */ +* response is received. +*/ static int cb_statfs_update (void *cookie,int rc) {struct obd_info *oinfo = cookie;
@@ -666,7 +670,8 @@ static int cb_statfs_update(void *cookie, int rc) lov_sfs = oinfo->oi_osfs; success =atomic_read (&set->set_success);/* XXX: the same is done in lov_update_common_set, however -lovset->set_exp is not initialized. */ +* lovset->set_exp is not initialized. +*/ lov_update_set (set, lovreq, rc);if (rc) goto out;
@@ -724,7 +729,8 @@ int lov_prep_statfs_set(struct obd_device *obd, struct obd_info *oinfo, }/* skip targets that have been explicitly disabled by the -* administrator */ +* administrator +*/ if (!lov->lov_tgts[i]->ltd_exp) {CDEBUG (D_HA ,"lov idx %d administratively disabled\n" , i);continue ;
drivers/staging/lustre/lustre/lov/lovsub_lock.c +4 -2
@@ -148,7 +148,8 @@ static void lovsub_lock_descr_map(const struct cl_lock_descr *in, {pgoff_t size;/* stripe size in pages */ pgoff_t skip;/* how many pages in every stripe are occupied by -* "other" stripes */ +* "other" stripes +*/ pgoff_t start;pgoff_t end;
@@ -284,7 +285,8 @@ static int lovsub_lock_delete_one(const struct lu_env *env,switch (parent->cll_state) {case CLS_ENQUEUED :/* See LU-1355 for the case that a glimpse lock is -* interrupted by signal */ +* interrupted by signal +*/ LASSERT (parent->cll_flags &CLF_CANCELLED );break ;case CLS_QUEUING :
Signature · 1 line
2.1.0
PATCH 50/56 staging/lustre/mdc: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/mdc/mdc_lib.c | 3 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 87 ++++++++++++++++--------- drivers/staging/lustre/lustre/mdc/mdc_reint.c | 12 ++-- drivers/staging/lustre/lustre/mdc/mdc_request.c | 27 +++++--- 4 files changed, 84 insertions(+), 45 deletions(-)
drivers/staging/lustre/lustre/mdc/mdc_lib.c +2 -1
@@ -489,7 +489,8 @@ static int mdc_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw)/* We record requests in flight in cli->cl_r_in_flight here. * There is only one write rpc possible in mdc anyway. If this to change -* in the future - the code may need to be revisited. */ +* in the future - the code may need to be revisited. +*/ int mdc_enter_request (struct client_obd *cli) {int rc =0 ;
drivers/staging/lustre/lustre/mdc/mdc_locks.c +56 -31
230 lines not on this page · raw message
drivers/staging/lustre/lustre/mdc/mdc_reint.c +8 -4
@@ -65,7 +65,8 @@ static int mdc_reint(struct ptlrpc_request *request,/* Find and cancel locally locks matched by inode @bits & @mode in the resource * found by @fid. Found locks are added into @cancel list. Returns the amount of -* locks added to @cancels list. */ +* locks added to @cancels list. +*/ int mdc_resource_get_unused (struct obd_export *exp,const struct lu_fid *fid,struct list_head *cancels,enum ldlm_mode mode,__u64 bits)
@@ -81,7 +82,8 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,* * This distinguishes from a case when ELC is not supported originally, * when we still want to cancel locks in advance and just cancel them -* locally, without sending any RPC. */ +* locally, without sending any RPC. +*/ if (exp_connect_cancelset (exp) && !ns_connect_cancelset (ns))return 0 ;
@@ -258,7 +260,8 @@ rebuild:ptlrpc_request_set_replen (req);/* ask ptlrpc not to resend on EINPROGRESS since we have our own retry -* logic here */ +* logic here +*/ req->rq_no_retry_einprogress =1 ;if (resends) {
@@ -276,7 +279,8 @@ rebuild: goto resend; }else if (rc == -EINPROGRESS ) {/* Retry create infinitely until succeed or get other -* error code. */ +* error code. +*/ ptlrpc_req_finished (req); resends++;
drivers/staging/lustre/lustre/mdc/mdc_request.c +18 -9
@@ -63,7 +63,8 @@ static inline int mdc_queue_wait(struct ptlrpc_request *req)/* mdc_enter_request() ensures that this client has no more * than cl_max_rpcs_in_flight RPCs simultaneously inf light -* against an MDT. */ +* against an MDT. +*/ rc =mdc_enter_request (cli);if (rc !=0 )return rc;
@@ -813,7 +814,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,/* To avoid a livelock (bug 7034), we need to send CLOSE RPCs to a * portal whose threads are not taking any DLM locks and are therefore -* always progressing */ +* always progressing +*/ req->rq_request_portal =MDS_READPAGE_PORTAL ;ptlrpc_at_set_req_timeout (req);
@@ -827,7 +829,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,DEBUG_REQ (D_HA , mod->mod_open_req,"matched open" );/* We no longer want to preserve this open for replay even -* though the open was committed. b=3632, b=3633 */ +* though the open was committed. b=3632, b=3633 +*/ spin_lock (&mod->mod_open_req->rq_lock); mod->mod_open_req->rq_replay =0 ;spin_unlock (&mod->mod_open_req->rq_lock);
@@ -884,7 +887,8 @@ static int mdc_close(struct obd_export *exp, struct md_op_data *op_data,if (rc !=0 ) mod->mod_close_req =NULL ;/* Since now, mod is accessed through open_req only, -* thus close req does not keep a reference on mod anymore. */ +* thus close req does not keep a reference on mod anymore. +*/ obd_mod_put (mod); } *request = req;
@@ -918,7 +922,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data, mod->mod_close_req = req;DEBUG_REQ (D_HA , mod->mod_open_req,"matched setattr" );/* We no longer want to preserve this setattr for replay even -* though the open was committed. b=3632, b=3633 */ +* though the open was committed. b=3632, b=3633 +*/ spin_lock (&mod->mod_open_req->rq_lock); mod->mod_open_req->rq_replay =0 ;spin_unlock (&mod->mod_open_req->rq_lock);
@@ -950,7 +955,8 @@ static int mdc_done_writing(struct obd_export *exp, struct md_op_data *op_data,mdc_free_open (mod);/* Since now, mod is accessed through setattr req only, -* thus DW req does not keep a reference on mod anymore. */ +* thus DW req does not keep a reference on mod anymore. +*/ obd_mod_put (mod); }
@@ -1608,7 +1614,8 @@ static int mdc_quotacheck(struct obd_device *unused, struct obd_export *exp,ptlrpc_request_set_replen (req);/* the next poll will find -ENODATA, that means quotacheck is -* going on */ +* going on +*/ cli->cl_qchk_stat = -ENODATA ; rc =ptlrpc_queue_wait (req);if (rc)
@@ -1908,7 +1915,8 @@ static int mdc_get_info_rpc(struct obd_export *exp, rc =ptlrpc_queue_wait (req);/* -EREMOTE means the get_info result is partial, and it needs to -* continue on another MDT, see fid2path part in lmv_iocontrol */ +* continue on another MDT, see fid2path part in lmv_iocontrol +*/ if (rc ==0 || rc == -EREMOTE ) { tmp =req_capsule_server_get (&req->rq_pill, &RMF_GETINFO_VAL );memcpy (val, tmp, vallen);
@@ -2247,7 +2255,8 @@ static int mdc_cancel_for_recovery(struct ldlm_lock *lock)/* FIXME: if we ever get into a situation where there are too many * opened files with open locks on a single node, then we really -* should replay these open locks to reget it */ +* should replay these open locks to reget it +*/ if (lock->l_policy_data.l_inodebits.bits &MDS_INODELOCK_OPEN )return 0 ;
Signature · 1 line
2.1.0
PATCH 51/56 staging/lustre/mgc: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/mgc/mgc_request.c | 71 ++++++++++++++++--------- 1 file changed, 46 insertions(+), 25 deletions(-)
drivers/staging/lustre/lustre/mgc/mgc_request.c +46 -25
@@ -90,7 +90,8 @@ static int mgc_name2resid(char *name, int len, struct ldlm_res_id *res_id,int mgc_fsname2resid (char *fsname,struct ldlm_res_id *res_id,int type) {/* fsname is at most 8 chars long, maybe contain "-". -* e.g. "lustre", "SUN-000" */ +* e.g. "lustre", "SUN-000" +*/ return mgc_name2resid (fsname,strlen (fsname), res_id, type); }EXPORT_SYMBOL (mgc_fsname2resid);
@@ -102,7 +103,8 @@ static int mgc_logname2resid(char *logname, struct ldlm_res_id *res_id, int type/* logname consists of "fsname-nodetype". * e.g. "lustre-MDT0001", "SUN-000-client" -* there is an exception: llog "params" */ +* there is an exception: llog "params" +*/ name_end =strrchr (logname,'-' );if (!name_end) len =strlen (logname);
@@ -125,7 +127,8 @@ static int config_log_get(struct config_llog_data *cld) }/* Drop a reference to a config log. When no longer referenced, -we can free the config log data */ +* we can free the config log data +*/ static void config_log_put (struct config_llog_data *cld) { CDEBUG(D_INFO, "log %s refs %d\n", cld->cld_logname,
@@ -252,7 +255,8 @@ static struct config_llog_data *config_recover_log_add(struct obd_device *obd,char logname[32 ];/* we have to use different llog for clients and mdts for cmd -* where only clients are notified if one of cmd server restarts */ +* where only clients are notified if one of cmd server restarts +*/ LASSERT (strlen (fsname) <sizeof (logname) /2 );strcpy (logname, fsname);LASSERT (lcfg.cfg_instance);
@@ -483,8 +487,9 @@ static void do_requeue(struct config_llog_data *cld)LASSERT (atomic_read (&cld->cld_refcount) >0 );/* Do not run mgc_process_log on a disconnected export or an -export which is being disconnected. Take the client -semaphore to make the check non-racy. */ +* export which is being disconnected. Take the client +* semaphore to make the check non-racy. +*/ down_read (&cld->cld_mgcexp->exp_obd->u.cli.cl_sem);if (cld->cld_mgcexp->exp_obd->u.cli.cl_conn_count !=0 ) {CDEBUG (D_MGC ,"updating log %s\n" , cld->cld_logname);
@@ -529,8 +534,9 @@ static int mgc_requeue_thread(void *data) }/* Always wait a few seconds to allow the server who -caused the lock revocation to finish its setup, plus some -random so everyone doesn't try to reconnect at once. */ +* caused the lock revocation to finish its setup, plus some +* random so everyone doesn't try to reconnect at once. +*/ to =MGC_TIMEOUT_MIN_SECONDS *HZ ; to += rand *HZ /100 ;/* rand is centi-seconds */ lwi =LWI_TIMEOUT (to,NULL ,NULL );
@@ -559,7 +565,8 @@ static int mgc_requeue_thread(void *data)LASSERT (atomic_read (&cld->cld_refcount) >0 );/* Whether we enqueued again or not in mgc_process_log, -* we're done with the ref from the old enqueue */ +* we're done with the ref from the old enqueue +*/ if (cld_prev)config_log_put (cld_prev); cld_prev = cld;
@@ -575,7 +582,8 @@ static int mgc_requeue_thread(void *data)config_log_put (cld_prev);/* break after scanning the list so that we can drop -* refcount to losing lock clds */ +* refcount to losing lock clds +*/ if (unlikely (stopped)) {spin_lock (&config_list_lock);break ;
@@ -598,7 +606,8 @@ static int mgc_requeue_thread(void *data) }/* Add a cld to the list to requeue. Start the requeue thread if needed. -We are responsible for dropping the config log reference from here on out. */ +* We are responsible for dropping the config log reference from here on out. +*/ static void mgc_requeue_add (struct config_llog_data *cld) { CDEBUG(D_INFO, "log %s: requeue (r=%d sp=%d st=%x)\n",
@@ -635,7 +644,8 @@ static int mgc_llog_init(const struct lu_env *env, struct obd_device *obd)int rc;/* setup only remote ctxt, the local disk context is switched per each -* filesystem during mgc_fs_setup() */ +* filesystem during mgc_fs_setup() +*/ rc =llog_setup (env, obd, &obd->obd_olg,LLOG_CONFIG_REPL_CTXT , obd, &llog_client_ops);if (rc)
@@ -697,7 +707,8 @@ static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)static int mgc_cleanup (struct obd_device *obd) {/* COMPAT_146 - old config logs may have added profiles we don't -know about */ +* know about +*/ if (obd->obd_type->typ_refcnt <=1 )/* Only for the last mgc */ class_del_profiles ();
@@ -794,7 +805,8 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,break ; }/* Make sure not to re-enqueue when the mgc is stopping -(we get called from client_disconnect_export) */ +* (we get called from client_disconnect_export) +*/ if (!lock->l_conn_export || !lock->l_conn_export->exp_obd->u.cli.cl_conn_count) { CDEBUG(D_MGC, "log %.8s: disconnecting, won't requeue\n",
@@ -816,7 +828,8 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,/* Not sure where this should go... */ /* This is the timeout value for MGS_CONNECT request plus a ping interval, such -* that we can have a chance to try the secondary MGS if any. */ +* that we can have a chance to try the secondary MGS if any. +*/ #define MGC_ENQUEUE_LIMIT (INITIAL_CONNECT_TIMEOUT + (AT_OFF ? 0 : at_min) \ + PING_INTERVAL)#define MGC_TARGET_REG_LIMIT 10
@@ -880,7 +893,8 @@ static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm, cld->cld_resid.name[0]);/* We need a callback for every lockholder, so don't try to -ldlm_lock_match (see rev 1.1.2.11.2.47) */ +* ldlm_lock_match (see rev 1.1.2.11.2.47) +*/ req =ptlrpc_request_alloc_pack (class_exp2cliimp (exp), &RQF_LDLM_ENQUEUE ,LUSTRE_DLM_VERSION ,LDLM_ENQUEUE );
@@ -895,7 +909,8 @@ static int mgc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm, rc =ldlm_cli_enqueue (exp, &req, &einfo, &cld->cld_resid,NULL , flags,NULL ,0 ,LVB_T_NONE , lockh,0 );/* A failed enqueue should still call the mgc_blocking_ast, -where it will be requeued if needed ("grant failed"). */ +* where it will be requeued if needed ("grant failed"). +*/ ptlrpc_req_finished (req);return rc; }
@@ -1373,7 +1388,8 @@ again: }/* always update the index even though it might have errors with -* handling the recover logs */ +* handling the recover logs +*/ cfg->cfg_last_idx = res->mcr_offset; eof = res->mcr_offset == res->mcr_size;
@@ -1400,7 +1416,8 @@ again: mne_swab = !!ptlrpc_rep_need_swab (req);#if LUSTRE_VERSION_CODE <OBD_OCD_VERSION (3 ,2 ,50 ,0 )/* This import flag means the server did an extra swab of IR MNE -* records (fixed in LU-1252), reverse it here if needed. LU-1644 */ +* records (fixed in LU-1252), reverse it here if needed. LU-1644 +*/ if (unlikely (req->rq_import->imp_need_mne_swab)) mne_swab = !mne_swab;#else
@@ -1489,7 +1506,8 @@ static int mgc_process_cfg_log(struct obd_device *mgc,/* logname and instance info should be the same, so use our * copy of the instance for the update. The cfg_last_idx will -* be updated here. */ +* be updated here. +*/ rc =class_config_parse_llog (env, ctxt, cld->cld_logname, &cld->cld_cfg);
@@ -1529,9 +1547,10 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)LASSERT (cld);/* I don't want multiple processes running process_log at once -- -sounds like badness. It actually might be fine, as long as -we're not trying to update from the same log -simultaneously (in which case we should use a per-log sem.) */ +* sounds like badness. It actually might be fine, as long as +* we're not trying to update from the same log +* simultaneously (in which case we should use a per-log sem.) +*/ mutex_lock (&cld->cld_lock);if (cld->cld_stopping) {mutex_unlock (&cld->cld_lock);
@@ -1556,7 +1575,8 @@ int mgc_process_log(struct obd_device *mgc, struct config_llog_data *cld)CDEBUG (D_MGC ,"Can't get cfg lock: %d\n" , rcl);/* mark cld_lostlock so that it will requeue -* after MGC becomes available. */ +* after MGC becomes available. +*/ cld->cld_lostlock =1 ;/* Get extra reference, it will be put in requeue thread */ config_log_get (cld);
@@ -1642,7 +1662,8 @@ static int mgc_process_config(struct obd_device *obd, u32 len, void *buf)/* COMPAT_146 */ /* FIXME only set this for old logs! Right now this forces -us to always skip the "inside markers" check */ +* us to always skip the "inside markers" check +*/ cld->cld_cfg.cfg_flags |=CFG_F_COMPAT146 ; rc =mgc_process_log (obd, cld);
Signature · 1 line
2.1.0
PATCH 52/56 staging/lustre/obdclass: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/obdclass/cl_io.c | 13 +++-- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 24 +++++--- drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +- drivers/staging/lustre/lustre/obdclass/genops.c | 42 ++++++++------ .../lustre/lustre/obdclass/linux/linux-module.c | 3 +- drivers/staging/lustre/lustre/obdclass/llog.c | 6 +- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 3 +- drivers/staging/lustre/lustre/obdclass/llog_swab.c | 3 +- .../lustre/lustre/obdclass/lprocfs_counters.c | 6 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 3 +- .../lustre/lustre/obdclass/lustre_handles.c | 3 +- .../staging/lustre/lustre/obdclass/lustre_peer.c | 3 +- .../staging/lustre/lustre/obdclass/obd_config.c | 42 +++++++++----- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 67 ++++++++++++++-------- drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- 15 files changed, 144 insertions(+), 85 deletions(-)
drivers/staging/lustre/lustre/obdclass/cl_io.c +7 -6
@@ -44,6 +44,7 @@#include "../include/obd_support.h" #include "../include/lustre_fid.h" #include <linux/list.h> +#include <linux/sched.h> #include "../include/cl_object.h" #include "cl_internal.h"
@@ -308,7 +309,8 @@ static void cl_io_locks_sort(struct cl_io *io) &prev->cill_linkage); done =0 ;continue ;/* don't change prev: it's -* still "previous" */ +* still "previous" +*/ case -1 :/* already in order */ break ; }
@@ -419,7 +421,8 @@ static int cl_lockset_lock(const struct lu_env *env, struct cl_io *io,list_for_each_entry_safe (link, temp, &set->cls_todo, cill_linkage) {if (!cl_lockset_match (set, &link->cill_descr)) {/* XXX some locking to guarantee that locks aren't -* expanded in between. */ +* expanded in between. +*/ result =cl_lockset_lock_one (env, io, set, link);if (result !=0 )break ;
@@ -1053,7 +1056,8 @@ EXPORT_SYMBOL(cl_page_list_init);void cl_page_list_add (struct cl_page_list *plist,struct cl_page *page) {/* it would be better to check that page is owned by "current" io, but -* it is not passed here. */ +* it is not passed here. +*/ LASSERT (page->cp_owner);LINVRNT (plist->pl_owner == current);
@@ -1510,9 +1514,6 @@ void cl_req_attr_set(const struct lu_env *env, struct cl_req *req, }EXPORT_SYMBOL (cl_req_attr_set); -/* XXX complete(), init_completion(), and wait_for_completion(), until they are -* implemented in libcfs. */ -# include <linux/sched.h> /** * Initialize synchronous io wait anchor, for transfer of \a nrpages pages.
drivers/staging/lustre/lustre/obdclass/cl_lock.c +16 -8
@@ -935,7 +935,8 @@ int cl_lock_state_wait(const struct lu_env *env, struct cl_lock *lock)if (result ==0 ) {/* To avoid being interrupted by the 'non-fatal' signals * (SIGCHLD, for instance), we'd block them temporarily. -* LU-305 */ +* LU-305 +*/ blocked =cfs_block_sigsinv (LUSTRE_FATAL_SIGS );init_waitqueue_entry (&waiter, current);
@@ -946,7 +947,8 @@ int cl_lock_state_wait(const struct lu_env *env, struct cl_lock *lock)LASSERT (cl_lock_nr_mutexed (env) ==0 );/* Returning ERESTARTSYS instead of EINTR so syscalls -* can be restarted if signals are pending here */ +* can be restarted if signals are pending here +*/ result = -ERESTARTSYS ;if (likely (!OBD_FAIL_CHECK (OBD_FAIL_LOCK_STATE_WAIT_INTR ))) {schedule ();
@@ -1170,7 +1172,8 @@ int cl_enqueue_try(const struct lu_env *env, struct cl_lock *lock,/* kick layers. */ result =cl_enqueue_kick (env, lock, io, flags);/* For AGL case, the cl_lock::cll_state may -* become CLS_HELD already. */ +* become CLS_HELD already. +*/ if (result ==0 && lock->cll_state ==CLS_QUEUING )cl_lock_state_set (env, lock,CLS_ENQUEUED );break ;
@@ -1300,7 +1303,8 @@ int cl_unuse_try(const struct lu_env *env, struct cl_lock *lock) }/* Only if the lock is in CLS_HELD or CLS_ENQUEUED state, it can hold -* underlying resources. */ +* underlying resources. +*/ if (!(lock->cll_state ==CLS_HELD || lock->cll_state ==CLS_ENQUEUED )) {cl_lock_user_del (env, lock);return 0 ;
@@ -1777,13 +1781,15 @@ struct cl_lock *cl_lock_at_pgoff(const struct lu_env *env, lock =NULL ; need->cld_mode =CLM_READ ;/* CLM_READ matches both READ & WRITE, but -* not PHANTOM */ +* not PHANTOM +*/ need->cld_start = need->cld_end = index; need->cld_enq_flags =0 ;spin_lock (&head->coh_lock_guard);/* It is fine to match any group lock since there could be only one -* with a uniq gid and it conflicts with all other lock modes too */ +* with a uniq gid and it conflicts with all other lock modes too +*/ list_for_each_entry (scan, &head->coh_locks, cll_linkage) { if (scan != except && (scan->cll_descr.cld_mode == CLM_GROUP ||
@@ -1798,7 +1804,8 @@ struct cl_lock *cl_lock_at_pgoff(const struct lu_env *env, (canceld || !(scan->cll_flags & CLF_CANCELLED)) && (pending || !(scan->cll_flags & CLF_CANCELPEND))) {/* Don't increase cs_hit here since this -* is just a helper function. */ +* is just a helper function. +*/ cl_lock_get_trust (scan); lock = scan;break ;
@@ -1843,7 +1850,8 @@ static int check_and_discard_cb(const struct lu_env *env, struct cl_io *io,/* Cache the first-non-overlapped index so as to skip * all pages within [index, clt_fn_index). This * is safe because if tmp lock is canceled, it will -* discard these pages. */ +* discard these pages. +*/ info->clt_fn_index = tmp->cll_descr.cld_end +1 ;if (tmp->cll_descr.cld_end ==CL_PAGE_EOF ) info->clt_fn_index =CL_PAGE_EOF ;
drivers/staging/lustre/lustre/obdclass/class_obd.c +2 -3
@@ -508,7 +508,8 @@ static int __init init_obdclass(void)/* Default the dirty page cache cap to 1/2 of system memory. * For clients with less memory, a larger fraction is needed -* for other purposes (mostly for BGL). */ +* for other purposes (mostly for BGL). +*/ if (totalram_pages <=512 << (20 -PAGE_CACHE_SHIFT )) obd_max_dirty_pages = totalram_pages /4 ;else
@@ -543,8 +544,6 @@ static int __init init_obdclass(void)return err; } -/* liblustre doesn't call cleanup_obdclass, apparently. we carry on in this -* ifdef to the end of the file to cover module and versioning goo.*/ static void cleanup_obdclass (void ) {int i;
drivers/staging/lustre/lustre/obdclass/genops.c +26 -16
102 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +2 -1
@@ -102,7 +102,8 @@ int obd_ioctl_getdata(char **buf, int *len, void __user *arg)/* When there are lots of processes calling vmalloc on multi-core * system, the high lock contention will hurt performance badly, * obdfilter-survey is an example, which relies on ioctl. So we'd -* better avoid vmalloc on ioctl path. LU-66 */ +* better avoid vmalloc on ioctl path. LU-66 +*/ *buf =libcfs_kvzalloc (hdr.ioc_len,GFP_NOFS );if (!*buf) { CERROR("Cannot allocate control buffer of len %d\n",
drivers/staging/lustre/lustre/obdclass/llog.c +4 -2
@@ -260,7 +260,8 @@ repeat:/* NB: when rec->lrh_len is accessed it is already swabbed * since it is used at the "end" of the loop and the rec -* swabbing is done at the beginning of the loop. */ +* swabbing is done at the beginning of the loop. +*/ for (rec = (struct llog_rec_hdr *)buf; (char *)rec < buf +LLOG_CHUNK_SIZE ; rec = (struct llog_rec_hdr *)((char *)rec + rec->lrh_len)) {
@@ -377,7 +378,8 @@ int llog_process_or_fork(const struct lu_env *env,struct task_struct *task;/* The new thread can't use parent env, -* init the new one in llog_process_thread_daemonize. */ +* init the new one in llog_process_thread_daemonize. +*/ lpi->lpi_env =NULL ;init_completion (&lpi->lpi_completion); task = kthread_run(llog_process_thread_daemonize, lpi,
drivers/staging/lustre/lustre/obdclass/llog_obd.c +2 -1
@@ -88,7 +88,8 @@ int __llog_ctxt_put(const struct lu_env *env, struct llog_ctxt *ctxt)spin_unlock (&obd->obd_dev_lock);/* obd->obd_starting is needed for the case of cleanup -* in error case while obd is starting up. */ +* in error case while obd is starting up. +*/ LASSERTF(obd->obd_starting == 1 || obd->obd_stopping == 1 || obd->obd_set_up == 0, "wrong obd state: %d/%d/%d\n", !!obd->obd_starting,
drivers/staging/lustre/lustre/obdclass/llog_swab.c +2 -1
@@ -386,7 +386,8 @@ void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size)* * Overwrite fields from the end first, so they are not * clobbered, and use memmove() instead of memcpy() because -* the source and target buffers overlap. bug 16771 */ +* the source and target buffers overlap. bug 16771 +*/ createtime = cm32->cm_createtime; canceltime = cm32->cm_canceltime;memmove (marker->cm_comment, cm32->cm_comment,MTI_NAMELEN32 );
drivers/staging/lustre/lustre/obdclass/lprocfs_counters.c +4 -2
@@ -55,7 +55,8 @@ void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount) "idx %d, ls_num %hu\n", idx, stats->ls_num);/* With per-client stats, statistics are allocated only for -* single CPU area, so the smp_id should be 0 always. */ +* single CPU area, so the smp_id should be 0 always. +*/ smp_id =lprocfs_stats_lock (stats,LPROCFS_GET_SMP_ID , &flags);if (smp_id <0 )return ;
@@ -103,7 +104,8 @@ void lprocfs_counter_sub(struct lprocfs_stats *stats, int idx, long amount) "idx %d, ls_num %hu\n", idx, stats->ls_num);/* With per-client stats, statistics are allocated only for -* single CPU area, so the smp_id should be 0 always. */ +* single CPU area, so the smp_id should be 0 always. +*/ smp_id =lprocfs_stats_lock (stats,LPROCFS_GET_SMP_ID , &flags);if (smp_id <0 )return ;
drivers/staging/lustre/lustre/obdclass/lu_object.c +2 -1
@@ -532,7 +532,8 @@ static struct lu_object *htable_lookup(struct lu_site *s, *version = ver; bkt =cfs_hash_bd_extra_get (s->ls_obj_hash, bd);/* cfs_hash_bd_peek_locked is a somehow "internal" function -* of cfs_hash, it doesn't add refcount on object. */ +* of cfs_hash, it doesn't add refcount on object. +*/ hnode =cfs_hash_bd_peek_locked (s->ls_obj_hash, bd, (void *)f);if (!hnode) {lprocfs_counter_incr (s->ls_stats,LU_SS_CACHE_MISS );
drivers/staging/lustre/lustre/obdclass/lustre_handles.c +2 -1
@@ -143,7 +143,8 @@ void *class_handle2object(__u64 cookie)LASSERT (handle_hash);/* Be careful when you want to change this code. See the -* rcu_read_lock() definition on top this file. - jxiong */ +* rcu_read_lock() definition on top this file. - jxiong +*/ bucket = handle_hash + (cookie &HANDLE_HASH_MASK );rcu_read_lock ();
drivers/staging/lustre/lustre/obdclass/lustre_peer.c +2 -1
@@ -93,7 +93,8 @@ int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index)EXPORT_SYMBOL (lustre_uuid_to_peer);/* Add a nid to a niduuid. Multiple nids can be added to a single uuid; -LNET will choose the best one. */ +* LNET will choose the best one. +*/ int class_add_uuid (const char *uuid,__u64 nid) {struct uuid_nid_data *data, *entry;
drivers/staging/lustre/lustre/obdclass/obd_config.c +27 -15
114 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/obd_mount.c +42 -25
171 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/obdo.c +4 -2
@@ -55,7 +55,8 @@ void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent)EXPORT_SYMBOL (obdo_set_parent_fid);/* WARNING: the file systems must take care not to tinker with -attributes they don't manage (such as blocks). */ +* attributes they don't manage (such as blocks). +*/ void obdo_from_inode (struct obdo *dst,struct inode *src,u32 valid) {u32 newvalid =0 ;
@@ -122,7 +123,8 @@ void obdo_to_ioobj(struct obdo *oa, struct obd_ioobj *ioobj)ostid_set_seq_mdt0 (&ioobj->ioo_oid);/* Since 2.4 this does not contain o_mode in the low 16 bits. -* Instead, it holds (bd_md_max_brw - 1) for multi-bulk BRW RPCs */ +* Instead, it holds (bd_md_max_brw - 1) for multi-bulk BRW RPCs +*/ ioobj->ioo_max_brw =0 ; }EXPORT_SYMBOL (obdo_to_ioobj);
Signature · 1 line
2.1.0
PATCH 53/56 staging/lustre/obdecho: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/obdecho/echo_client.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/staging/lustre/lustre/obdecho/echo_client.c +6 -3
@@ -746,7 +746,8 @@ static struct lu_device *echo_device_alloc(const struct lu_env *env, cleanup =4 ;/* if echo client is to be stacked upon ost device, the next is -* NULL since ost is not a clio device so far */ +* NULL since ost is not a clio device so far +*/ if (next && !lu_device_is_cl (next)) next =NULL ;
@@ -965,7 +966,8 @@ static struct echo_object *cl_echo_object_find(struct echo_device *d, }/* In the function below, .hs_keycmp resolves to -* lu_obj_hop_keycmp() */ +* lu_obj_hop_keycmp() +*/ /* coverity[overrun-buffer-val] */ obj =cl_object_find (env,echo_dev2cl (d), fid, &conf->eoc_cl);if (IS_ERR (obj)) {
@@ -1164,7 +1166,8 @@ static int cl_echo_object_brw(struct echo_object *eco, int rw, u64 offset,cl_page_list_add (&queue->c2_qin, clp);/* drop the reference count for cl_page_find, so that the page -* will be freed in cl_2queue_fini. */ +* will be freed in cl_2queue_fini. +*/ cl_page_put (env, clp);cl_page_clip (env, clp,0 , page_size);
Signature · 1 line
2.1.0
PATCH 54/56 staging/lustre/osc: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/osc/osc_cache.c | 168 ++++++++++++++------- .../staging/lustre/lustre/osc/osc_cl_internal.h | 33 ++-- drivers/staging/lustre/lustre/osc/osc_internal.h | 8 +- drivers/staging/lustre/lustre/osc/osc_io.c | 6 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 45 ++++-- drivers/staging/lustre/lustre/osc/osc_page.c | 42 ++++-- drivers/staging/lustre/lustre/osc/osc_quota.c | 16 +- drivers/staging/lustre/lustre/osc/osc_request.c | 151 +++++++++++------- 8 files changed, 310 insertions(+), 159 deletions(-)
drivers/staging/lustre/lustre/osc/osc_cache.c +112 -56
@@ -262,7 +262,8 @@ static int osc_extent_sanity_check0(struct osc_extent *ext, }/* Do not verify page list if extent is in RPC. This is because an -* in-RPC extent is supposed to be exclusively accessible w/o lock. */ +* in-RPC extent is supposed to be exclusively accessible w/o lock. +*/ if (ext->oe_state >OES_CACHE ) { rc =0 ; goto out;
@@ -587,7 +588,8 @@ void osc_extent_release(const struct lu_env *env, struct osc_extent *ext)if (ext->oe_trunc_pending) {/* a truncate process is waiting for this extent. * This may happen due to a race, check -* osc_cache_truncate_start(). */ +* osc_cache_truncate_start(). +*/ osc_extent_state_set (ext,OES_TRUNC ); ext->oe_trunc_pending =0 ; }else {
@@ -704,18 +706,21 @@ restart:/* ok, from now on, ext and cur have these attrs: * 1. covered by the same lock -* 2. contiguous at chunk level or overlapping. */ +* 2. contiguous at chunk level or overlapping. +*/ if (overlapped (ext, cur)) {/* cur is the minimum unit, so overlapping means -* full contain. */ +* full contain. +*/ EASSERTF ((ext->oe_start <= cur->oe_start && ext->oe_end >= cur->oe_end), ext,EXTSTR ,EXTPARA (cur));if (ext->oe_state >OES_CACHE || ext->oe_fsync_wait) {/* for simplicity, we wait for this extent to -* finish before going forward. */ +* finish before going forward. +*/ conflict =osc_extent_get (ext);break ; }
@@ -728,17 +733,20 @@ restart:if (ext->oe_state !=OES_CACHE || ext->oe_fsync_wait) {/* we can't do anything for a non OES_CACHE extent, or * if there is someone waiting for this extent to be -* flushed, try next one. */ +* flushed, try next one. +*/ ext =next_extent (ext);continue ; }/* check if they belong to the same rpc slot before trying to * merge. the extents are not overlapped and contiguous at -* chunk level to get here. */ +* chunk level to get here. +*/ if (ext->oe_max_end != max_end) {/* if they don't belong to the same RPC slot or -* max_pages_per_rpc has ever changed, do not merge. */ +* max_pages_per_rpc has ever changed, do not merge. +*/ ext =next_extent (ext);continue ; }
@@ -747,7 +755,8 @@ restart:* level so that we know the whole extent is covered by grant * (the pages in the extent are NOT required to be contiguous). * Otherwise, it will be too much difficult to know which -* chunks have grants allocated. */ +* chunks have grants allocated. +*/ /* try to do front merge - extend ext's start */ if (chunk +1 == ext_chk_start) {
@@ -767,7 +776,8 @@ restart: *grants -= chunksize;/* try to merge with the next one because we just fill -* in a gap */ +* in a gap +*/ if (osc_extent_merge (env, ext,next_extent (ext)) ==0 )/* we can save extent tax from next extent */ *grants += cli->cl_extent_tax;
@@ -807,7 +817,8 @@ restart:LASSERT (!found);/* waiting for IO to finish. Please notice that it's impossible -* to be an OES_TRUNC extent. */ +* to be an OES_TRUNC extent. +*/ rc =osc_extent_wait (env, conflict,OES_INV );osc_extent_put (env, conflict); conflict =NULL ;
@@ -864,7 +875,8 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext, last_count != PAGE_CACHE_SIZE) {/* For short writes we shouldn't count parts of pages that * span a whole chunk on the OST side, or our accounting goes -* wrong. Should match the code in filter_grant_check. */ +* wrong. Should match the code in filter_grant_check. +*/ int offset = oap->oap_page_off & ~CFS_PAGE_MASK ;int count = oap->oap_count + (offset & (blocksize -1 ));int end = (offset + oap->oap_count) & (blocksize -1 );
@@ -908,7 +920,8 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,osc_object_lock (obj);LASSERT (sanity_check_nolock (ext) ==0 );/* `Kick' this extent only if the caller is waiting for it to be -* written out. */ +* written out. +*/ if (state ==OES_INV && !ext->oe_urgent && !ext->oe_hp && !ext->oe_trunc_pending) {if (ext->oe_state ==OES_ACTIVE ) {
@@ -966,7 +979,8 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,/* Request new lu_env. * We can't use that env from osc_cache_truncate_start() because -* it's from lov_io_sub and not fully initialized. */ +* it's from lov_io_sub and not fully initialized. +*/ env =cl_env_nested_get (&nest); io = &osc_env_info (env)->oti_io; io->ci_obj =cl_object_top (osc2cl (obj));
@@ -983,7 +997,8 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,LASSERT (list_empty (&oap->oap_rpc_item));/* only discard the pages with their index greater than -* trunc_index, and ... */ +* trunc_index, and ... +*/ if (sub->cp_index < trunc_index || (sub->cp_index == trunc_index && partial)) {/* accounting how many pages remaining in the chunk
@@ -1027,11 +1042,13 @@ static int osc_extent_truncate(struct osc_extent *ext, pgoff_t trunc_index,pgoff_t last_index;/* if there is no pages in this chunk, we can also free grants -* for the last chunk */ +* for the last chunk +*/ if (pages_in_chunk ==0 ) {/* if this is the 1st chunk and no pages in this chunk, * ext->oe_nr_pages must be zero, so we should be in -* the other if-clause. */ +* the other if-clause. +*/ LASSERT (trunc_chunk >0 ); --trunc_chunk; ++chunks;
@@ -1104,7 +1121,8 @@ static int osc_extent_make_ready(const struct lu_env *env,LASSERT (page_count == ext->oe_nr_pages);LASSERT (last);/* the last page is the only one we need to refresh its count by -* the size of file. */ +* the size of file. +*/ if (!(last->oap_async_flags &ASYNC_COUNT_STABLE )) { last->oap_count =osc_refresh_count (env, last,OBD_BRW_WRITE );LASSERT (last->oap_count >0 );
@@ -1113,7 +1131,8 @@ static int osc_extent_make_ready(const struct lu_env *env, }/* for the rest of pages, we don't need to call osf_refresh_count() -* because it's known they are not the last page */ +* because it's known they are not the last page +*/ list_for_each_entry (oap, &ext->oe_pages, oap_pending_item) {if (!(oap->oap_async_flags &ASYNC_COUNT_STABLE )) { oap->oap_count =PAGE_CACHE_SIZE - oap->oap_page_off;
@@ -1168,7 +1187,8 @@ static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants) next =next_extent (ext);if (next && next->oe_start <= end_index) {/* complex mode - overlapped with the next extent, -* this case will be handled by osc_extent_find() */ +* this case will be handled by osc_extent_find() +*/ rc = -EAGAIN ; goto out; }
@@ -1365,7 +1385,8 @@ static void osc_consume_write_grant(struct client_obd *cli, }/* the companion to osc_consume_write_grant, called when a brw has completed. -* must be called with the loi lock held. */ +* must be called with the loi lock held. +*/ static void osc_release_write_grant (struct client_obd *cli,struct brw_page *pga) {
@@ -1408,7 +1429,8 @@ static void __osc_unreserve_grant(struct client_obd *cli,/* it's quite normal for us to get more grant than reserved. * Thinking about a case that two extents merged by adding a new * chunk, we can save one extent tax. If extent tax is greater than -* one chunk, we can save more grant by adding a new chunk */ +* one chunk, we can save more grant by adding a new chunk +*/ cli->cl_reserved_grant -= reserved;if (unused > reserved) { cli->cl_avail_grant += reserved;
@@ -1452,7 +1474,8 @@ static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages, cli->cl_lost_grant += lost_grant;if (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) {/* borrow some grant from truncate to avoid the case that -* truncate uses up all avail grant */ +* truncate uses up all avail grant +*/ cli->cl_lost_grant -= grant; cli->cl_avail_grant += grant; }
@@ -1537,7 +1560,8 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,client_obd_list_lock (&cli->cl_loi_list_lock);/* force the caller to try sync io. this can jump the list -* of queued writes and create a discontiguous rpc stream */ +* of queued writes and create a discontiguous rpc stream +*/ if (OBD_FAIL_CHECK (OBD_FAIL_OSC_NO_GRANT ) || cli->cl_dirty_max <PAGE_CACHE_SIZE || cli->cl_ar.ar_force_sync || loi->loi_ar.ar_force_sync) {
@@ -1556,7 +1580,8 @@ static int osc_enter_cache(const struct lu_env *env, struct client_obd *cli,* Adding a cache waiter will trigger urgent write-out no matter what * RPC size will be. * The exiting condition is no avail grants and no dirty pages caching, -* that really means there is no space on the OST. */ +* that really means there is no space on the OST. +*/ init_waitqueue_head (&ocw.ocw_waitq); ocw.ocw_oap = oap; ocw.ocw_grant = bytes;
@@ -1638,7 +1663,8 @@ static int osc_max_rpc_in_flight(struct client_obd *cli, struct osc_object *osc)/* This maintains the lists of pending pages to read/write for a given object * (lop). This is used by osc_check_rpcs->osc_next_obj() and osc_list_maint() -* to quickly find objects that are ready to send an RPC. */ +* to quickly find objects that are ready to send an RPC. +*/ static int osc_makes_rpc (struct client_obd *cli,struct osc_object *osc,int cmd) {
@@ -1647,7 +1673,8 @@ static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc,/* if we have an invalid import we want to drain the queued pages * by forcing them through rpcs that immediately fail and complete * the pages. recovery relies on this to empty the queued pages -* before canceling the locks and evicting down the llite pages */ +* before canceling the locks and evicting down the llite pages +*/ if (!cli->cl_import || cli->cl_import->imp_invalid) invalid_import =1 ;
@@ -1668,7 +1695,8 @@ static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, }/* trigger a write rpc stream as long as there are dirtiers * waiting for space. as they're waiting, they're not going to -* create more pages to coalesce with what's waiting.. */ +* create more pages to coalesce with what's waiting.. +*/ if (!list_empty (&cli->cl_cache_waiters)) {CDEBUG (D_CACHE ,"cache waiters forcing RPC\n" );return 1 ;
@@ -1721,7 +1749,8 @@ static void on_list(struct list_head *item, struct list_head *list, int should_b }/* maintain the osc's cli list membership invariants so that osc_send_oap_rpc -* can find pages to build into rpcs quickly */ +* can find pages to build into rpcs quickly +*/ static int __osc_list_maint (struct client_obd *cli,struct osc_object *osc) {if (osc_makes_hprpc (osc)) {
@@ -1759,7 +1788,8 @@ static int osc_list_maint(struct client_obd *cli, struct osc_object *osc)* application. As an async write fails we record the error code for later if * the app does an fsync. As long as errors persist we force future rpcs to be * sync so that the app can get a sync error and break the cycle of queueing -* pages for which writeback will fail. */ +* pages for which writeback will fail. +*/ static void osc_process_ar (struct osc_async_rc *ar,__u64 xid,int rc) {
@@ -1778,7 +1808,8 @@ static void osc_process_ar(struct osc_async_rc *ar, __u64 xid, }/* this must be called holding the loi list lock to give coverage to exit_cache, -* async_flag maintenance, and oap_request */ +* async_flag maintenance, and oap_request +*/ static void osc_ap_completion (const struct lu_env *env,struct client_obd *cli,struct osc_async_page *oap,int sent,int rc) {
@@ -1966,7 +1997,8 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli, }/* we're going to grab page lock, so release object lock because -* lock order is page lock -> object lock. */ +* lock order is page lock -> object lock. +*/ osc_object_unlock (osc);list_for_each_entry_safe (ext, tmp, &rpclist, oe_link) {
@@ -2051,12 +2083,14 @@ osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli, })/* This is called by osc_check_rpcs() to find which objects have pages that -* we could be sending. These lists are maintained by osc_makes_rpc(). */ +* we could be sending. These lists are maintained by osc_makes_rpc(). +*/ static struct osc_object *osc_next_obj (struct client_obd *cli) {/* First return objects that have blocked locks so that they * will be flushed quickly and other clients can get the lock, -* then objects which have pages ready to be stuffed into RPCs */ +* then objects which have pages ready to be stuffed into RPCs +*/ if (!list_empty (&cli->cl_loi_hp_ready_list))return list_to_obj (&cli->cl_loi_hp_ready_list, hp_ready_item);if (!list_empty (&cli->cl_loi_ready_list))
@@ -2065,13 +2099,15 @@ static struct osc_object *osc_next_obj(struct client_obd *cli)/* then if we have cache waiters, return all objects with queued * writes. This is especially important when many small files * have filled up the cache and not been fired into rpcs because -* they don't pass the nr_pending/object threshold */ +* they don't pass the nr_pending/object threshold +*/ if (!list_empty (&cli->cl_cache_waiters) && !list_empty (&cli->cl_loi_write_list))return list_to_obj (&cli->cl_loi_write_list, write_item);/* then return all queued objects when we have an invalid import -* so that they get flushed */ +* so that they get flushed +*/ if (!cli->cl_import || cli->cl_import->imp_invalid) {if (!list_empty (&cli->cl_loi_write_list))return list_to_obj (&cli->cl_loi_write_list, write_item);
@@ -2109,7 +2145,8 @@ static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli)* would be redundant if we were getting read/write work items * instead of objects. we don't want send_oap_rpc to drain a * partial read pending queue when we're given this object to -* do io on writes while there are cache waiters */ +* do io on writes while there are cache waiters +*/ osc_object_lock (osc);if (osc_makes_rpc (cli, osc,OBD_BRW_WRITE )) { rc =osc_send_write_rpc (env, cli, osc);
@@ -2131,7 +2168,8 @@ static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli)* because it might be blocked at grabbing * the page lock as we mentioned. * -* Anyway, continue to drain pages. */ +* Anyway, continue to drain pages. +*/ /* break; */ } }
@@ -2161,7 +2199,8 @@ static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli,if (!async) {/* disable osc_lru_shrink() temporarily to avoid -* potential stack overrun problem. LU-2859 */ +* potential stack overrun problem. LU-2859 +*/ atomic_inc (&cli->cl_lru_shrinkers);client_obd_list_lock (&cli->cl_loi_list_lock);osc_check_rpcs (env, cli);
@@ -2285,12 +2324,14 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,* 1. if there exists an active extent for this IO, mostly this page * can be added to the active extent and sometimes we need to * expand extent to accommodate this page; -* 2. otherwise, a new extent will be allocated. */ +* 2. otherwise, a new extent will be allocated. +*/ ext = oio->oi_active;if (ext && ext->oe_start <= index && ext->oe_max_end >= index) {/* one chunk plus extent overhead must be enough to write this -* page */ +* page +*/ grants = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;if (ext->oe_end >= index) grants =0 ;
@@ -2333,7 +2374,8 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,/* try to find new extent to cover this page */ LASSERT (!oio->oi_active);/* we may have allocated grant for this page if we failed -* to expand the previous active extent. */ +* to expand the previous active extent. +*/ LASSERT (ergo (grants >0 , grants >= tmp)); rc =0 ;
@@ -2398,7 +2440,8 @@ int osc_teardown_async_page(const struct lu_env *env, ext =osc_extent_lookup (obj,oap2cl_page (oap)->cp_index);/* only truncated pages are allowed to be taken out. * See osc_extent_truncate() and osc_cache_truncate_start() -* for details. */ +* for details. +*/ if (ext && ext->oe_state !=OES_TRUNC ) {OSC_EXTENT_DUMP (D_ERROR , ext,"trunc at %lu.\n" ,oap2cl_page (oap)->cp_index);
@@ -2449,7 +2492,8 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io,* exists a deadlock problem because other process can wait for * page writeback bit holding page lock; and meanwhile in * vvp_page_make_ready(), we need to grab page lock before -* really sending the RPC. */ +* really sending the RPC. +*/ case OES_TRUNC :/* race with truncate, page will be redirtied */ case OES_ACTIVE :
@@ -2457,7 +2501,8 @@ int osc_flush_async_page(const struct lu_env *env, struct cl_io *io,* re-dirty the page. If we continued on here, and we were the * one making the extent active, we could deadlock waiting for * the page writeback to clear but it won't because the extent -* is active and won't be written out. */ +* is active and won't be written out. +*/ rc = -EAGAIN ; goto out;default :
@@ -2528,7 +2573,8 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops)if (ext->oe_start <= index && ext->oe_end >= index) {LASSERT (ext->oe_state ==OES_LOCK_DONE );/* For OES_LOCK_DONE state extent, it has already held -* a refcount for RPC. */ +* a refcount for RPC. +*/ found =osc_extent_get (ext);break ; }
@@ -2544,7 +2590,8 @@ int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops) }else {osc_object_unlock (obj);/* ok, it's been put in an rpc. only one oap gets a request -* reference */ +* reference +*/ if (oap->oap_request) {ptlrpc_mark_interrupted (oap->oap_request);ptlrpcd_wake (oap->oap_request);
@@ -2646,7 +2693,8 @@ again:/* if ext is in urgent state, it means there must exist * a page already having been flushed by write_page(). * We have to wait for this extent because we can't -* truncate that page. */ +* truncate that page. +*/ LASSERT (!ext->oe_hp);OSC_EXTENT_DUMP (D_CACHE , ext,"waiting for busy extent\n" );
@@ -2661,7 +2709,8 @@ again:/* though we grab inode mutex for write path, but we * release it before releasing extent(in osc_io_end()), * so there is a race window that an extent is still -* in OES_ACTIVE when truncate starts. */ +* in OES_ACTIVE when truncate starts. +*/ LASSERT (!ext->oe_trunc_pending); ext->oe_trunc_pending =1 ; }else {
@@ -2686,7 +2735,8 @@ again:list_del_init (&ext->oe_link);/* extent may be in OES_ACTIVE state because inode mutex -* is released before osc_io_end() in file write case */ +* is released before osc_io_end() in file write case +*/ if (ext->oe_state !=OES_TRUNC )osc_extent_wait (env, ext,OES_TRUNC );
@@ -2711,7 +2761,8 @@ again:/* we need to hold this extent in OES_TRUNC state so * that no writeback will happen. This is to avoid -* BUG 17397. */ +* BUG 17397. +*/ LASSERT (!oio->oi_trunc); oio->oi_trunc =osc_extent_get (ext); OSC_EXTENT_DUMP(D_CACHE, ext,
@@ -2723,7 +2774,8 @@ again:int rc;/* ignore the result of osc_extent_wait the write initiator -* should take care of it. */ +* should take care of it. +*/ rc =osc_extent_wait (env, waiting,OES_INV );if (rc <0 )OSC_EXTENT_DUMP (D_CACHE , waiting,"error: %d.\n" , rc);
@@ -2870,7 +2922,8 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj, unplug = true; }else {/* the only discarder is lock cancelling, so -* [start, end] must contain this extent */ +* [start, end] must contain this extent +*/ EASSERT (ext->oe_start >= start && ext->oe_max_end <= end, ext);osc_extent_state_set (ext,OES_LOCKING );
@@ -2885,14 +2938,16 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,/* It's pretty bad to wait for ACTIVE extents, because * we don't know how long we will wait for it to be * flushed since it may be blocked@awaiting more -* grants. We do this for the correctness of fsync. */ +* grants. We do this for the correctness of fsync. +*/ LASSERT (hp ==0 && discard ==0 ); ext->oe_urgent =1 ;break ;case OES_TRUNC :/* this extent is being truncated, can't do anything * for it now. it will be set to urgent after truncate -* is finished in osc_cache_truncate_end(). */ +* is finished in osc_cache_truncate_end(). +*/ default :break ; }
@@ -2911,7 +2966,8 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,EASSERT (ext->oe_state ==OES_LOCKING , ext);/* Discard caching pages. We don't actually write this -* extent out but we complete it as if we did. */ +* extent out but we complete it as if we did. +*/ rc =osc_extent_make_ready (env, ext);if (unlikely (rc <0 )) { OSC_EXTENT_DUMP(D_ERROR, ext,
drivers/staging/lustre/lustre/osc/osc_cl_internal.h +22 -11
@@ -69,10 +69,12 @@ struct osc_io {/** true if this io is lockless. */ int oi_lockless;/** active extents, we know how many bytes is going to be written, -* so having an active extent will prevent it from being fragmented */ +* so having an active extent will prevent it from being fragmented +*/ struct osc_extent *oi_active;/** partially truncated extent, we need to hold this extent to prevent -* page writeback from happening. */ +* page writeback from happening. +*/ struct osc_extent *oi_trunc;struct obd_info oi_info;
@@ -154,7 +156,8 @@ struct osc_object {atomic_t oo_nr_writes;/** Protect extent tree. Will be used to protect -* oo_{read|write}_pages soon. */ +* oo_{read|write}_pages soon. +*/ spinlock_t oo_lock; };
@@ -627,22 +630,26 @@ struct osc_extent { oe_srvlock:1, oe_memalloc:1, /** an ACTIVE extent is going to be truncated, so when this extent - * is released, it will turn into TRUNC state instead of CACHE. */ + * is released, it will turn into TRUNC state instead of CACHE. + */ oe_trunc_pending:1, /** this extent should be written asap and someone may wait for the * write to finish. This bit is usually set along with urgent if * the extent was CACHE state. * fsync_wait extent can't be merged because new extent region may - * exceed fsync range. */ + * exceed fsync range. + */ oe_fsync_wait:1, /** covering lock is being canceled */ oe_hp:1, /** this extent should be written back asap. set if one of pages is - * called by page WB daemon, or sync write or reading requests. */ + * called by page WB daemon, or sync write or reading requests. + */ oe_urgent:1;/** how many grants allocated for this extent. * Grant allocated for this extent. There is no grant allocated -* for reading extents and sync write extents. */ +* for reading extents and sync write extents. +*/ unsigned int oe_grants;/** # of dirty pages in this extent */ unsigned int oe_nr_pages;
@@ -655,21 +662,25 @@ struct osc_extent {struct osc_page *oe_next_page;/** start and end index of this extent, include start and end * themselves. Page offset here is the page index of osc_pages. -* oe_start is used as keyword for red-black tree. */ +* oe_start is used as keyword for red-black tree. +*/ pgoff_t oe_start;pgoff_t oe_end;/** maximum ending index of this extent, this is limited by -* max_pages_per_rpc, lock extent and chunk size. */ +* max_pages_per_rpc, lock extent and chunk size. +*/ pgoff_t oe_max_end;/** waitqueue - for those who want to be notified if this extent's -* state has changed. */ +* state has changed. +*/ wait_queue_head_t oe_waitq;/** lock covering this extent */ struct cl_lock *oe_osclock;/** terminator of this extent. Must be true if this extent is in IO. */ struct task_struct *oe_owner;/** return value of writeback. If somebody is waiting for this extent, -* this value can be known by outside world. */ +* this value can be known by outside world. +*/ int oe_rc;/** max pages per rpc when this extent was created */ unsigned int oe_mppr;
drivers/staging/lustre/lustre/osc/osc_internal.h +5 -3
@@ -47,11 +47,13 @@ struct lu_env;enum async_flags {ASYNC_READY =0x1 ,/* ap_make_ready will not be called before this -page is added to an rpc */ +* page is added to an rpc +*/ ASYNC_URGENT =0x2 ,/* page must be put into an RPC before return */ ASYNC_COUNT_STABLE =0x4 ,/* ap_refresh_count will not be called -to give the caller a chance to update -or cancel the size of the io */ +* to give the caller a chance to update +* or cancel the size of the io +*/ ASYNC_HP =0x10 , };
drivers/staging/lustre/lustre/osc/osc_io.c +4 -2
@@ -272,7 +272,8 @@ static int osc_io_prepare_write(const struct lu_env *env,/* this page contains `invalid' data, but who cares? * nobody can access the invalid data. * in osc_io_commit_write(), we're going to write exact -* [from, to) bytes of this page to OST. -jay */ +* [from, to) bytes of this page to OST. -jay +*/ cl_page_export (env, slice->cpl_page,1 );return result;
@@ -596,7 +597,8 @@ static int osc_io_fsync_start(const struct lu_env *env,* send OST_SYNC RPC. This is bad because it causes extents * to be written osc by osc. However, we usually start * writeback before CL_FSYNC_ALL so this won't have any real -* problem. */ +* problem. +*/ rc =osc_cache_wait_range (env, osc, start, end);if (result ==0 ) result = rc;
drivers/staging/lustre/lustre/osc/osc_lock.c +30 -15
135 lines not on this page · raw message
drivers/staging/lustre/lustre/osc/osc_page.c +28 -14
123 lines not on this page · raw message
drivers/staging/lustre/lustre/osc/osc_quota.c +10 -6
@@ -47,10 +47,12 @@ int osc_quota_chkdq(struct client_obd *cli, const unsigned int qid[]) oqi =cfs_hash_lookup (cli->cl_quota_hash[type], &qid[type]);if (oqi) {/* do not try to access oqi here, it could have been -* freed by osc_quota_setdq() */ +* freed by osc_quota_setdq() +*/ /* the slot is busy, the user is about to run out of -* quota space on this OST */ +* quota space on this OST +*/ CDEBUG (D_QUOTA ,"chkdq found noquota for %s %d\n" , type ==USRQUOTA ?"user" :"grout" , qid[type]);return NO_QUOTA ;
@@ -84,7 +86,8 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[], oqi =cfs_hash_lookup (cli->cl_quota_hash[type], &qid[type]);if ((flags &FL_QUOTA_FLAG (type)) !=0 ) {/* This ID is getting close to its quota limit, let's -* switch to sync I/O */ +* switch to sync I/O +*/ if (oqi)continue ;
@@ -108,7 +111,8 @@ int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[], qid[type], rc); }else {/* This ID is now off the hook, let's remove it from -* the hash table */ +* the hash table +*/ if (!oqi)continue ;
@@ -297,8 +301,8 @@ int osc_quotacheck(struct obd_device *unused, struct obd_export *exp,ptlrpc_request_set_replen (req); -/* the next poll will find -ENODATA, that means quotacheck is -* going on */ +/* the next poll will find -ENODATA, that means quotacheck is going on +*/ cli->cl_qchk_stat = -ENODATA ; rc =ptlrpc_queue_wait (req);if (rc)
drivers/staging/lustre/lustre/osc/osc_request.c +99 -52
426 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 55/56 staging/lustre/ptlrpc: Adjust comments to better conform to coding style
In reply to [email protected]From: Oleg Drokin <[email protected]>
This patch fixes "Block comments use a trailing */ on a separate line" warnings from checkpatch
--- drivers/staging/lustre/lustre/ptlrpc/connection.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/events.c | 51 ++++++--- drivers/staging/lustre/lustre/ptlrpc/import.c | 114 ++++++++++++-------- drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 8 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 9 +- drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 42 +++++--- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 6 +- .../staging/lustre/lustre/ptlrpc/pack_generic.c | 33 ++++-- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 11 +- .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 - drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 9 +- drivers/staging/lustre/lustre/ptlrpc/recover.c | 18 ++-- drivers/staging/lustre/lustre/ptlrpc/sec.c | 27 +++-- drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 3 +- drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 117 ++++++++++++++------- 17 files changed, 301 insertions(+), 164 deletions(-)
drivers/staging/lustre/lustre/ptlrpc/connection.c +2 -1
@@ -72,7 +72,8 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self,* returned and may be compared against out object. */ /* In the function below, .hs_keycmp resolves to -* conn_keycmp() */ +* conn_keycmp() +*/ /* coverity[overrun-buffer-val] */ conn2 =cfs_hash_findadd_unique (conn_hash, &peer, &conn->c_hash);if (conn != conn2) {
drivers/staging/lustre/lustre/ptlrpc/events.c +34 -17
150 lines not on this page · raw message
drivers/staging/lustre/lustre/ptlrpc/import.c +72 -42
287 lines not on this page · raw message
drivers/staging/lustre/lustre/ptlrpc/llog_client.c +5 -3
@@ -75,7 +75,8 @@ }while (0 )/* This is a callback from the llog_* functions. -* Assumes caller has already pushed us into the kernel context. */ +* Assumes caller has already pushed us into the kernel context. +*/ static int llog_client_open(const struct lu_env *env,struct llog_handle *lgh,struct llog_logid *logid,char *name,enum llog_open_param open_param)
@@ -316,8 +317,9 @@ static int llog_client_close(const struct lu_env *env, struct llog_handle *handle) {/* this doesn't call LLOG_ORIGIN_HANDLE_CLOSE because -the servers all close the file at the end of every -other LLOG_ RPC. */ +* the servers all close the file at the end of every +* other LLOG_ RPC. +*/ return 0 ; }
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c +6 -3
@@ -306,7 +306,8 @@ ptlrpc_lprocfs_req_history_max_seq_write(struct file *file,/* This sanity check is more of an insanity check; we can still * hose a kernel by allowing the request history to grow too -* far. */ +* far. +*/ bufpages = (svc->srv_buf_size +PAGE_CACHE_SIZE -1 ) >>PAGE_CACHE_SHIFT ;if (val > totalram_pages / (2 * bufpages))return -ERANGE ;
@@ -737,7 +738,8 @@ ptlrpc_lprocfs_svc_req_history_seek(struct ptlrpc_service_part *svcpt,* recent), search from it onwards. * Since the service history is LRU (i.e. culled reqs will * be near the head), we shouldn't have to do long -* re-scans */ +* re-scans +*/ LASSERTF(srhi->srhi_seq == srhi->srhi_req->rq_history_seq, "%s:%d: seek seq %llu, request seq %llu\n", svcpt->scp_service->srv_name, svcpt->scp_cpt,
@@ -915,7 +917,8 @@ static int ptlrpc_lprocfs_svc_req_history_show(struct seq_file *s, void *iter)* here. The request could contain any old crap, so you * must be just as careful as the service's request * parser. Currently I only print stuff here I know is OK -* to look at coz it was set up in request_in_callback()!!! */ +* to look at coz it was set up in request_in_callback()!!! +*/ seq_printf(s, "%lld:%s:%s:x%llu:%d:%s:%lld:%lds(%+lds) ", req->rq_history_seq, nidstr, libcfs_id2str(req->rq_peer), req->rq_xid,
drivers/staging/lustre/lustre/ptlrpc/niobuf.c +28 -14
126 lines not on this page · raw message
drivers/staging/lustre/lustre/ptlrpc/nrs.c +2 -4
@@ -43,9 +43,6 @@#include "../../include/linux/libcfs/libcfs.h" #include "ptlrpc_internal.h" -/* XXX: This is just for liblustre. Remove the #if defined directive when the -* "cfs_" prefix is dropped from cfs_list_head. */ -/** * NRS core object. */
@@ -1358,7 +1355,8 @@ void ptlrpc_nrs_req_finalize(struct ptlrpc_request *req)if (req->rq_nrq.nr_initialized) {nrs_resource_put_safe (req->rq_nrq.nr_res_ptrs);/* no protection on bit nr_initialized because no -* contention at this late stage */ +* contention at this late stage +*/ req->rq_nrq.nr_finalized =1 ; } }
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +22 -11
@@ -133,7 +133,8 @@ EXPORT_SYMBOL(lustre_msg_size_v2);* NOTE: this should only be used for NEW requests, and should always be * in the form of a v2 request. If this is a connection to a v1 * target then the first buffer will be stripped because the ptlrpc -* data is part of the lustre_msg_v1 header. b=14043 */ +* data is part of the lustre_msg_v1 header. b=14043 +*/ int lustre_msg_size (__u32 magic,int count,__u32 *lens) {__u32 size[] = {sizeof (struct ptlrpc_body ) };
@@ -157,7 +158,8 @@ int lustre_msg_size(__u32 magic, int count, __u32 *lens)EXPORT_SYMBOL (lustre_msg_size);/* This is used to determine the size of a buffer that was already packed -* and will correctly handle the different message formats. */ +* and will correctly handle the different message formats. +*/ int lustre_packed_msg_size (struct lustre_msg *msg) {switch (msg->lm_magic) {
@@ -267,7 +269,8 @@ lustre_get_emerg_rs(struct ptlrpc_service_part *svcpt)spin_unlock (&svcpt->scp_rep_lock);/* If we cannot get anything for some long time, we better -* bail out instead of waiting infinitely */ +* bail out instead of waiting infinitely +*/ lwi =LWI_TIMEOUT (cfs_time_seconds (10 ),NULL ,NULL ); rc =l_wait_event (svcpt->scp_rep_waitq, !list_empty (&svcpt->scp_rep_idle), &lwi);
@@ -676,7 +679,8 @@ int lustre_msg_buflen(struct lustre_msg *m, int n)EXPORT_SYMBOL (lustre_msg_buflen);/* NB return the bufcount for lustre_msg_v2 format, so if message is packed -* in V1 format, the result is one bigger. (add struct ptlrpc_body). */ +* in V1 format, the result is one bigger. (add struct ptlrpc_body). +*/ int lustre_msg_bufcount (struct lustre_msg *m) {switch (m->lm_magic) {
@@ -797,7 +801,8 @@ __u32 lustre_msg_get_flags(struct lustre_msg *msg)/* no break */ default :/* flags might be printed in debug code while message -* uninitialized */ +* uninitialized +*/ return 0 ; } }
@@ -1030,7 +1035,8 @@ int lustre_msg_get_status(struct lustre_msg *msg)/* no break */ default :/* status might be printed in debug code while message -* uninitialized */ +* uninitialized +*/ return -EINVAL ; } }
@@ -1366,7 +1372,8 @@ void lustre_msg_set_jobid(struct lustre_msg *msg, char *jobid)struct ptlrpc_body *pb;/* Don't set jobid for ldlm ast RPCs, they've been shrunk. -* See the comment in ptlrpc_request_pack(). */ +* See the comment in ptlrpc_request_pack(). +*/ if (!opc || opc ==LDLM_BL_CALLBACK || opc ==LDLM_CP_CALLBACK || opc ==LDLM_GL_CALLBACK )return ;
@@ -1486,7 +1493,8 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *b)* clients and servers without ptlrpc_body_v2 (< 2.3) * do not swab any fields beyond pb_jobid, as we are * using this swab function for both ptlrpc_body -* and ptlrpc_body_v2. */ +* and ptlrpc_body_v2. +*/ CLASSERT(offsetof(typeof(*b), pb_jobid) != 0); }EXPORT_SYMBOL (lustre_swab_ptlrpc_body);
@@ -1500,7 +1508,8 @@ void lustre_swab_connect(struct obd_connect_data *ocd)__swab32s (&ocd->ocd_index);__swab32s (&ocd->ocd_brw_size);/* ocd_blocksize and ocd_inodespace don't need to be swabbed because -* they are 8-byte values */ +* they are 8-byte values +*/ __swab16s (&ocd->ocd_grant_extent);__swab32s (&ocd->ocd_unused);__swab64s (&ocd->ocd_transno);
@@ -1510,7 +1519,8 @@ void lustre_swab_connect(struct obd_connect_data *ocd)/* Fields after ocd_cksum_types are only accessible by the receiver * if the corresponding flag in ocd_connect_flags is set. Accessing * any field after ocd_maxbytes on the receiver without a valid flag -* may result in out-of-bound memory access and kernel oops. */ +* may result in out-of-bound memory access and kernel oops. +*/ if (ocd->ocd_connect_flags &OBD_CONNECT_MAX_EASIZE )__swab32s (&ocd->ocd_max_easize);if (ocd->ocd_connect_flags &OBD_CONNECT_MAXBYTES )
@@ -1970,7 +1980,8 @@ static void lustre_swab_ldlm_policy_data(ldlm_wire_policy_data_t *d) {/* the lock data is a union and the first two fields are always an * extent so it's ok to process an LDLM_EXTENT and LDLM_FLOCK lock -* data the same way. */ +* data the same way. +*/ __swab64s (&d->l_extent.start);__swab64s (&d->l_extent.end);__swab64s (&d->l_extent.gid);
drivers/staging/lustre/lustre/ptlrpc/pinger.c +6 -5
@@ -257,11 +257,12 @@ static int ptlrpc_pinger_main(void *arg)/* Wait until the next ping time, or until we're stopped. */ time_to_next_wake =pinger_check_timeout (this_ping);/* The ping sent by ptlrpc_send_rpc may get sent out -say .01 second after this. -ptlrpc_pinger_sending_on_import will then set the -next ping time to next_ping + .01 sec, which means -we will SKIP the next ping at next_ping, and the -ping will get sent 2 timeouts from now! Beware. */ +* say .01 second after this. +* ptlrpc_pinger_sending_on_import will then set the +* next ping time to next_ping + .01 sec, which means +* we will SKIP the next ping at next_ping, and the +* ping will get sent 2 timeouts from now! Beware. +*/ CDEBUG(D_INFO, "next wakeup in " CFS_DURATION_T " (%ld)\n", time_to_next_wake, cfs_time_add(this_ping,
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h +0 -2
@@ -101,8 +101,6 @@ struct nrs_core {* registration/unregistration, and NRS core lprocfs operations. */ struct mutex nrs_mutex; -/* XXX: This is just for liblustre. Remove the #if defined directive -* when the * "cfs_" prefix is dropped from cfs_list_head. */ /** * List of all policy descriptors registered with NRS core; protected * by nrs_core::nrs_mutex.
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c +6 -3
@@ -241,7 +241,8 @@ void ptlrpcd_add_req(struct ptlrpc_request *req)l_wait_event (req->rq_set_waitq, !req->rq_set, &lwi); }else if (req->rq_set) {/* If we have a valid "rq_set", just reuse it to avoid double -* linked. */ +* linked. +*/ LASSERT (req->rq_phase ==RQ_PHASE_NEW );LASSERT (req->rq_send_state ==LUSTRE_IMP_REPLAY );
@@ -319,7 +320,8 @@ static int ptlrpcd_check(struct lu_env *env, struct ptlrpcd_ctl *pc) rc |=ptlrpc_check_set (env, set);/* NB: ptlrpc_check_set has already moved completed request at the -* head of seq::set_requests */ +* head of seq::set_requests +*/ list_for_each_safe (pos, tmp, &set->set_requests) { req = list_entry(pos, struct ptlrpc_request, rq_set_chain);if (req->rq_phase !=RQ_PHASE_COMPLETE )
@@ -337,7 +339,8 @@ static int ptlrpcd_check(struct lu_env *env, struct ptlrpcd_ctl *pc) rc =atomic_read (&set->set_new_count);/* If we have nothing to do, check whether we can take some -* work from our partner threads. */ +* work from our partner threads. +*/ if (rc ==0 && pc->pc_npartners >0 ) {struct ptlrpcd_ctl *partner;struct ptlrpc_request_set *ps;
drivers/staging/lustre/lustre/ptlrpc/recover.c +12 -6
@@ -114,7 +114,8 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)if (req->rq_transno > last_transno) {/* Since the imp_committed_list is immutable before * all of it's requests being replayed, it's safe to -* use a cursor to accelerate the search */ +* use a cursor to accelerate the search +*/ imp->imp_replay_cursor = imp->imp_replay_cursor->next; while (imp->imp_replay_cursor !=
@@ -137,7 +138,8 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight) }/* All the requests in committed list have been replayed, let's replay -* the imp_replay_list */ +* the imp_replay_list +*/ if (!req) {list_for_each_safe (tmp, pos, &imp->imp_replay_list) { req = list_entry(tmp, struct ptlrpc_request,
@@ -152,7 +154,8 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)/* If need to resend the last sent transno (because a reconnect * has occurred), then stop on the matching req and send it again. * If, however, the last sent transno has been committed then we -* continue replay from the next request. */ +* continue replay from the next request. +*/ if (req && imp->imp_resend_replay)lustre_msg_add_flags (req->rq_reqmsg,MSG_RESENT );
@@ -249,7 +252,8 @@ void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req) }/* Wait for recovery to complete and resend. If evicted, then -this request will be errored out later.*/ +* this request will be errored out later. +*/ spin_lock (&failed_req->rq_lock);if (!failed_req->rq_no_resend) failed_req->rq_resend =1 ;
@@ -271,13 +275,15 @@ int ptlrpc_set_import_active(struct obd_import *imp, int active)LASSERT (obd);/* When deactivating, mark import invalid, and abort in-flight -* requests. */ +* requests. +*/ if (!active) {LCONSOLE_WARN ("setting import %s INACTIVE by administrator request\n" ,obd2cli_tgt (imp->imp_obd));/* set before invalidate to avoid messages about imp_inval -* set without imp_deactive in ptlrpc_import_delay_req */ +* set without imp_deactive in ptlrpc_import_delay_req +*/ spin_lock (&imp->imp_lock); imp->imp_deactive =1 ;spin_unlock (&imp->imp_lock);
drivers/staging/lustre/lustre/ptlrpc/sec.c +18 -9
@@ -445,7 +445,8 @@ int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,/* alloc new request buffer * we don't need to alloc reply buffer here, leave it to the -* rest procedure of ptlrpc */ +* rest procedure of ptlrpc +*/ if (reqmsg_size !=0 ) { rc =sptlrpc_cli_alloc_reqbuf (req, reqmsg_size);if (!rc) {
@@ -798,7 +799,8 @@ void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode)spin_unlock (&sec->ps_lock);/* force SVC_NULL for context initiation rpc, SVC_INTG for context -* destruction rpc */ +* destruction rpc +*/ if (unlikely (req->rq_ctx_init))flvr_set_svc (&req->rq_flvr.sf_rpc,SPTLRPC_SVC_NULL );else if (unlikely (req->rq_ctx_fini))
@@ -1688,7 +1690,8 @@ int sptlrpc_target_export_check(struct obd_export *exp,return 0 ;/* client side export has no imp_reverse, skip -* FIXME maybe we should check flavor this as well??? */ +* FIXME maybe we should check flavor this as well??? +*/ if (!exp->exp_imp_reverse)return 0 ;
@@ -1702,11 +1705,13 @@ int sptlrpc_target_export_check(struct obd_export *exp,* the first req with the new flavor, then treat it as current flavor, * adapt reverse sec according to it. * note the first rpc with new flavor might not be with root ctx, in -* which case delay the sec_adapt by leaving exp_flvr_adapt == 1. */ +* which case delay the sec_adapt by leaving exp_flvr_adapt == 1. +*/ if (unlikely (exp->exp_flvr_changed) &&flavor_allowed (&exp->exp_flvr_old[1 ], req)) {/* make the new flavor as "current", and old ones as -* about-to-expire */ +* about-to-expire +*/ CDEBUG (D_SEC ,"exp %p: just changed: %x->%x\n" , exp, exp->exp_flvr.sf_rpc, exp->exp_flvr_old[1 ].sf_rpc); flavor = exp->exp_flvr_old[1 ];
@@ -1742,10 +1747,12 @@ int sptlrpc_target_export_check(struct obd_export *exp, }/* if it equals to the current flavor, we accept it, but need to -* dealing with reverse sec/ctx */ +* dealing with reverse sec/ctx +*/ if (likely (flavor_allowed (&exp->exp_flvr, req))) {/* most cases should return here, we only interested in -* gss root ctx init */ +* gss root ctx init +*/ if (!req->rq_auth_gss || !req->rq_ctx_init || (!req->rq_auth_usr_root && !req->rq_auth_usr_mdt && !req->rq_auth_usr_ost)) {
@@ -1755,7 +1762,8 @@ int sptlrpc_target_export_check(struct obd_export *exp,/* if flavor just changed, we should not proceed, just leave * it and current flavor will be discovered and replaced -* shortly, and let _this_ rpc pass through */ +* shortly, and let _this_ rpc pass through +*/ if (exp->exp_flvr_changed) {LASSERT (exp->exp_flvr_adapt);spin_unlock (&exp->exp_lock);
@@ -1809,7 +1817,8 @@ int sptlrpc_target_export_check(struct obd_export *exp, }/* now it doesn't match the current flavor, the only chance we can -* accept it is match the old flavors which is not expired. */ +* accept it is match the old flavors which is not expired. +*/ if (exp->exp_flvr_changed ==0 && exp->exp_flvr_expire[1 ]) {if (exp->exp_flvr_expire[1 ] >=ktime_get_real_seconds ()) {if (flavor_allowed (&exp->exp_flvr_old[1 ], req)) {
drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +4 -2
@@ -166,11 +166,13 @@ again:* is not optimal. we perhaps want to use balanced binary tree * to trace each sec as order of expiry time. * another issue here is we wakeup as fixed interval instead of -* according to each sec's expiry time */ +* according to each sec's expiry time +*/ mutex_lock (&sec_gc_mutex);list_for_each_entry (sec, &sec_gc_list, ps_gc_list) {/* if someone is waiting to be deleted, let it -* proceed as soon as possible. */ +* proceed as soon as possible. +*/ if (atomic_read (&sec_gc_wait_del)) {CDEBUG (D_SEC ,"deletion pending, start over\n" );mutex_unlock (&sec_gc_mutex);
drivers/staging/lustre/lustre/ptlrpc/sec_null.c +2 -1
@@ -258,7 +258,8 @@ int null_enlarge_reqbuf(struct ptlrpc_sec *sec,* imp_replay_list traversing threads. See LU-3333 * This is a bandaid at best, we really need to deal with this * in request enlarging code before unpacking that's already -* there */ +* there +*/ if (req->rq_import)spin_lock (&req->rq_import->imp_lock);memcpy (newbuf, req->rq_reqbuf, req->rq_reqlen);
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c +4 -2
@@ -264,7 +264,8 @@ int plain_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req) } }else {/* whether we sent with bulk or not, we expect the same -* in reply, except for early reply */ +* in reply, except for early reply +*/ if (!req->rq_early && !equi (req->rq_pack_bulk ==1 , phdr->ph_flags &PLAIN_FL_BULK )) {
@@ -673,7 +674,8 @@ int plain_enlarge_reqbuf(struct ptlrpc_sec *sec,* imp_replay_list traversing threads. See LU-3333 * This is a bandaid at best, we really need to deal with this * in request enlarging code before unpacking that's already -* there */ +* there +*/ if (req->rq_import)spin_lock (&req->rq_import->imp_lock);
drivers/staging/lustre/lustre/ptlrpc/service.c +78 -39
344 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 56/56 staging/lustre: Fix indentation mistakes
In reply to [email protected]From: Oleg Drokin <[email protected]>
none look like bugs or bugs-inducing, mostly just
off by a couple of spaces all around.
--- .../staging/lustre/lustre/include/lprocfs_status.h | 2 +- .../lustre/lustre/include/lustre/lustre_idl.h | 8 ++-- .../lustre/lustre/include/lustre/lustre_user.h | 2 +- drivers/staging/lustre/lustre/llite/llite_mmap.c | 2 +- drivers/staging/lustre/lustre/llite/rw.c | 4 +- drivers/staging/lustre/lustre/llite/rw26.c | 2 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 8 ++-- drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 45 +++++++++++----------- .../lustre/lustre/obdclass/lprocfs_status.c | 2 +- .../staging/lustre/lustre/obdclass/obd_config.c | 2 +- drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +- drivers/staging/lustre/lustre/osc/osc_request.c | 2 +- 13 files changed, 42 insertions(+), 43 deletions(-)
drivers/staging/lustre/lustre/include/lprocfs_status.h +1 -1
@@ -276,7 +276,7 @@ static inline int opcode_offset(__u32 opc) OPC_RANGE(OST)); }else if (opc <FLD_LAST_OPC ) {/* FLD opcode */ - return (opc - FLD_FIRST_OPC + + return (opc - FLD_FIRST_OPC + OPC_RANGE(SEC) + OPC_RANGE(SEQ) + OPC_RANGE(QUOTA) +
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +4 -4
@@ -700,9 +700,9 @@ static inline int ostid_to_fid(struct lu_fid *fid, struct ost_id *ostid,* of 1M objects/s/OST for 9 years, or combinations thereof. */ if (ostid_id (ostid) >=IDIF_MAX_OID ) { -CERROR ("bad MDT0 id, " DOSTID " ost_idx:%u\n" , -POSTID (ostid), ost_idx); -return -EBADF ; +CERROR ("bad MDT0 id, " DOSTID " ost_idx:%u\n" , +POSTID (ostid), ost_idx); +return -EBADF ; } fid->f_seq =fid_idif_seq (ostid_id (ostid), ost_idx);/* truncate to 32 bits by assignment */
@@ -3154,7 +3154,7 @@ static inline void lustre_get_wire_obdo(struct obd_connect_data *ocd,__u32 local_flags =0 ;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;if (local_flags !=0 ) {
drivers/staging/lustre/lustre/include/lustre/lustre_user.h +1 -1
@@ -473,7 +473,7 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen) buf[buflen -1 ] ='\0' ; p =strrchr (buf,'-' );if (p) - *p ='\0' ; + *p ='\0' ; }/* printf display format
drivers/staging/lustre/lustre/llite/llite_mmap.c +1 -1
@@ -119,7 +119,7 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,*/ env =cl_env_nested_get (nest);if (IS_ERR (env)) -return ERR_PTR (-EINVAL ); +return ERR_PTR (-EINVAL ); *env_ret = env;
drivers/staging/lustre/lustre/llite/rw.c +2 -2
@@ -381,9 +381,9 @@ static int index_in_window(unsigned long index, unsigned long point,unsigned long start = point - before, end = point + after;if (start > point) - start =0 ; + start =0 ;if (end < point) - end = ~0 ; + end = ~0 ;return start <= index && index <= end; }
drivers/staging/lustre/lustre/llite/rw26.c +1 -1
@@ -248,7 +248,7 @@ ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,cl_2queue_init (queue);for (i =0 ; i < page_count; i++) {if (pv->ldp_offsets) - file_offset = pv->ldp_offsets[i]; + file_offset = pv->ldp_offsets[i];LASSERT (!(file_offset & (page_size -1 ))); clp = cl_page_find(env, obj, cl_index(obj, file_offset),
drivers/staging/lustre/lustre/lov/lov_obd.c +4 -4
@@ -779,9 +779,9 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)if (desc->ld_magic !=LOV_DESC_MAGIC ) {if (desc->ld_magic ==__swab32 (LOV_DESC_MAGIC )) { -CDEBUG (D_OTHER ,"%s: Swabbing lov desc %p\n" , - obd->obd_name, desc); -lustre_swab_lov_desc (desc); +CDEBUG (D_OTHER ,"%s: Swabbing lov desc %p\n" , + obd->obd_name, desc); +lustre_swab_lov_desc (desc); }else {CERROR ("%s: Bad lov desc magic: %#x\n" , obd->obd_name, desc->ld_magic);
@@ -1051,7 +1051,7 @@ static int lov_create(const struct lu_env *env, struct obd_export *exp,/* Recreate a specific object id at the given OST index */ if ((src_oa->o_valid &OBD_MD_FLFLAGS ) && (src_oa->o_flags &OBD_FL_RECREATE_OBJS )) { - rc =lov_recreate (exp, src_oa, ea, oti); + rc =lov_recreate (exp, src_oa, ea, oti); }obd_putref (exp->exp_obd);
drivers/staging/lustre/lustre/lov/lov_pool.c +1 -1
@@ -228,7 +228,7 @@ static void *pool_proc_start(struct seq_file *s, loff_t *pos) i =0 ;do { - ptr =pool_proc_next (s, &iter, &i); + ptr =pool_proc_next (s, &iter, &i); }while ((i < *pos) && ptr);return ptr; }
drivers/staging/lustre/lustre/obdclass/cl_io.c +22 -23
68 lines not on this page · raw message
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c +1 -1
@@ -577,7 +577,7 @@ EXPORT_SYMBOL(lprocfs_stats_collect);#define flag2str (flag, first) \ do { \ if (imp->imp_##flag) \ - seq_printf(m, "%s" #flag, first ? "" : ", "); \ + seq_printf(m, "%s" #flag, first ? "" : ", "); \ } while (0)static int obd_import_flags2str (struct obd_import *imp,struct seq_file *m) {
drivers/staging/lustre/lustre/obdclass/obd_config.c +1 -1
@@ -1038,7 +1038,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,* can pass it down the stack */ if (strnchr (key, keylen,'.' )) -return -ENOSYS ; +return -ENOSYS ;CERROR ("%s: unknown param %s\n" , (char *)lustre_cfg_string (lcfg,0 ), key);/* rc = -EINVAL; continue parsing other params */
drivers/staging/lustre/lustre/osc/lproc_osc.c +2 -2
@@ -422,8 +422,8 @@ static ssize_t osc_checksum_type_seq_write(struct file *file,if (((1 << i) & obd->u.cli.cl_supp_cksum_types) ==0 )continue ;if (!strcmp (kernbuf, cksum_name[i])) { - obd->u.cli.cl_cksum_type =1 << i; -return count; + obd->u.cli.cl_cksum_type =1 << i; +return count; } }return -EINVAL ;
drivers/staging/lustre/lustre/osc/osc_request.c +1 -1
@@ -2435,7 +2435,7 @@ static int osc_statfs_interpret(const struct lu_env *env,* aware of the problem and takes care * of the clean up */ -return rc; +return rc;if ((rc == -ENOTCONN || rc == -EAGAIN ) && (aa->aa_oi->oi_flags &OBD_STATFS_NODELAY )) {
Signature · 1 line
2.1.0