forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: remove multiple blank lines

Browse source 
Fixes checkpatch.pl CHECK:LINE_SPACING: Please don't use multiple blank
lines.

The patch is generated using checkpatch.pl --fix-inplace:

for f in $(find drivers/staging/lustre/ -type f) ; do
    ./scripts/checkpatch.pl --types "LINE_SPACING" --test-only=multiple \
    --fix-inplace  -f $f
done

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2015-10-13 16:03:41 +03:00 • committed by Greg Kroah-Hartman
commit 106495c41f
142 changed files with 0 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
View file

@ -41,7 +41,6 @@
#error Do not #include this file directly. #include <linux/libcfs/libcfs.h> instead
#endif
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <linux/ctype.h>
@ -86,7 +85,6 @@
#include "linux-time.h"
#include "linux-mem.h"
#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
#if !defined(__x86_64__)
@ -142,5 +140,4 @@ typedef long long_ptr_t;
#define WITH_WATCHDOG
#endif
#endif /* _LINUX_LIBCFS_H */

2
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
View file

@ -848,7 +848,6 @@ kiblnd_rd_msg_size(kib_rdma_desc_t *rd, int msgtype, int n)
offsetof(kib_putack_msg_t, ibpam_rd.rd_frags[n]);
}
static inline __u64
kiblnd_dma_mapping_error(struct ib_device *dev, u64 dma_addr)
{
@ -905,7 +904,6 @@ static inline unsigned int kiblnd_sg_dma_len(struct ib_device *dev,
#define KIBLND_CONN_PARAM(e) ((e)->param.conn.private_data)
#define KIBLND_CONN_PARAM_LEN(e) ((e)->param.conn.private_data_len)
struct ib_mr *kiblnd_find_rd_dma_mr(kib_hca_dev_t *hdev,
kib_rdma_desc_t *rd);
struct ib_mr *kiblnd_find_dma_mr(kib_hca_dev_t *hdev,

1
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
View file

@ -655,7 +655,6 @@ static int kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
return -EINVAL;
}
static int
kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
unsigned int niov, struct kvec *iov, int offset, int nob)

1
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
View file

@ -135,7 +135,6 @@ static int dev_failover;
module_param(dev_failover, int, 0444);
MODULE_PARM_DESC(dev_failover, "HCA failover for bonding (0 off, 1 on, other values reserved)");
static int require_privileged_port;
module_param(require_privileged_port, int, 0644);
MODULE_PARM_DESC(require_privileged_port, "require privileged port when accepting connection");

2
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
View file

@ -2445,7 +2445,6 @@ ksocknal_base_startup(void)
ksocknal_data.ksnd_connd_starting++;
spin_unlock_bh(&ksocknal_data.ksnd_connd_lock);
snprintf(name, sizeof(name), "socknal_cd%02d", i);
rc = ksocknal_thread_start(ksocknal_connd,
(void *)((ulong_ptr_t)i), name);
@ -2836,7 +2835,6 @@ ksocknal_startup(lnet_ni_t *ni)
return -ENETDOWN;
}
static void __exit
ksocknal_module_fini(void)
{

3
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
View file

@ -89,7 +89,6 @@ ksocknal_alloc_tx_noop(__u64 cookie, int nonblk)
return tx;
}
void
ksocknal_free_tx (ksock_tx_t *tx)
{
@ -773,7 +772,6 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn)
spin_unlock_bh(&sched->kss_lock);
}
ksock_route_t *
ksocknal_find_connectable_route_locked (ksock_peer_t *peer)
{
@ -2396,7 +2394,6 @@ ksocknal_send_keepalive_locked(ksock_peer_t *peer)
return -EIO;
}
static void
ksocknal_check_peer_timeouts (int idx)
{

1
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c
View file

@ -134,7 +134,6 @@ static unsigned int zc_recv_min_nfrags = 16;
module_param(zc_recv_min_nfrags, int, 0644);
MODULE_PARM_DESC(zc_recv_min_nfrags, "minimum # of fragments to enable ZC recv");
#if SOCKNAL_VERSION_DEBUG
static int protocol = 3;
module_param(protocol, int, 0644);

2
drivers/staging/lustre/lnet/lnet/acceptor.c
View file

@ -202,7 +202,6 @@ lnet_connect(struct socket **sockp, lnet_nid_t peer_nid,
}
EXPORT_SYMBOL(lnet_connect);
/* Below is the code common for both kernel and MT user-space */
static int
@ -447,7 +446,6 @@ lnet_acceptor_start(void)
if (rc != 0)
return rc;
init_completion(&lnet_acceptor_state.pta_signal);
rc = accept2secure(accept_type, &secure);
if (rc <= 0)

2
drivers/staging/lustre/lnet/lnet/api-ni.c
View file

@ -45,7 +45,6 @@
lnet_t the_lnet; /* THE state of the network */
EXPORT_SYMBOL(the_lnet);
static char *ip2nets = "";
module_param(ip2nets, charp, 0444);
MODULE_PARM_DESC(ip2nets, "LNET network <- IP table");
@ -529,7 +528,6 @@ lnet_res_lh_initialize(struct lnet_res_container *rec, lnet_libhandle_t *lh)
list_add(&lh->lh_hash_chain, &rec->rec_lh_hash[hash]);
}
int lnet_unprepare(void);
static int

3
drivers/staging/lustre/lnet/lnet/lib-eq.c
View file

@ -318,7 +318,6 @@ LNetEQWait(lnet_handle_eq_t eventq, lnet_event_t *event)
}
EXPORT_SYMBOL(LNetEQWait);
static int
lnet_eq_wait_locked(int *timeout_ms)
__must_hold(&the_lnet.ln_eq_wait_lock)
@ -357,8 +356,6 @@ __must_hold(&the_lnet.ln_eq_wait_lock)
return wait;
}
/**
* Block the calling process until there's an event from a set of EQs or
* timeout happens.

3
drivers/staging/lustre/lnet/lnet/lib-move.c
View file

@ -275,7 +275,6 @@ lnet_extract_iov(int dst_niov, struct kvec *dst,
}
EXPORT_SYMBOL(lnet_extract_iov);
unsigned int
lnet_kiov_nob(unsigned int niov, lnet_kiov_t *kiov)
{
@ -727,7 +726,6 @@ lnet_peer_is_alive(lnet_peer_t *lp, unsigned long now)
return alive;
}
/* NB: returns 1 when alive, 0 when dead, negative when error;
* may drop the lnet_net_lock */
static int
@ -867,7 +865,6 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send)
return 0;
}
static lnet_rtrbufpool_t *
lnet_msg2bufpool(lnet_msg_t *msg)
{

1
drivers/staging/lustre/lnet/lnet/router.c
View file

@ -162,7 +162,6 @@ lnet_ni_notify_locked(lnet_ni_t *ni, lnet_peer_t *lp)
lp->lp_notifying = 0;
}
static void
lnet_rtr_addref_locked(lnet_peer_t *lp)
{

1
drivers/staging/lustre/lnet/selftest/conrpc.c
View file

@ -40,7 +40,6 @@
* Author: Liang Zhen <liang@whamcloud.com>
*/
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-lnet.h"
#include "timer.h"

1
drivers/staging/lustre/lnet/selftest/conrpc.h
View file

@ -140,5 +140,4 @@ void lstcon_rpc_cleanup_wait(void);
int lstcon_rpc_module_init(void);
void lstcon_rpc_module_fini(void);
#endif

2
drivers/staging/lustre/lnet/selftest/console.c
View file

@ -40,7 +40,6 @@
* Author: Liang Zhen <liangzhen@clusterfs.com>
*/
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lib-lnet.h"
#include "console.h"
@ -2021,7 +2020,6 @@ lstcon_console_init(void)
for (i = 0; i < LST_GLOBAL_HASHSIZE; i++)
INIT_LIST_HEAD(&console_session.ses_ndl_hash[i]);
/* initialize acceptor service table */
lstcon_init_acceptor_service();

1
drivers/staging/lustre/lnet/selftest/console.h
View file

@ -43,7 +43,6 @@
#ifndef __LST_CONSOLE_H__
#define __LST_CONSOLE_H__
#include "../../include/linux/libcfs/libcfs.h"
#include "../../include/linux/lnet/lnet.h"
#include "../../include/linux/lnet/lib-types.h"

3
drivers/staging/lustre/lnet/selftest/framework.c
View file

@ -237,7 +237,6 @@ sfw_deactivate_session(void)
spin_lock(&sfw_data.fw_lock);
}
static void
sfw_session_expired(void *data)
{
@ -1633,7 +1632,6 @@ extern srpc_service_t brw_test_service;
extern void brw_init_test_client(void);
extern void brw_init_test_service(void);
int
sfw_startup(void)
{
@ -1643,7 +1641,6 @@ sfw_startup(void)
srpc_service_t *sv;
sfw_test_case_t *tsc;
if (session_timeout < 0) {
CERROR("Session timeout must be non-negative: %d\n",
session_timeout);

1
drivers/staging/lustre/lnet/selftest/module.c
View file

@ -150,7 +150,6 @@ error:
return rc;
}
MODULE_DESCRIPTION("LNet Selftest");
MODULE_LICENSE("GPL");
MODULE_VERSION("0.9.0");

2
drivers/staging/lustre/lnet/selftest/rpc.c
View file

@ -1354,7 +1354,6 @@ srpc_post_rpc(srpc_client_rpc_t *rpc)
return;
}
int
srpc_send_reply(struct srpc_server_rpc *rpc)
{
@ -1580,7 +1579,6 @@ srpc_lnet_ev_handler(lnet_event_t *ev)
}
}
int
srpc_startup(void)
{

1
drivers/staging/lustre/lnet/selftest/rpc.h
View file

@ -65,7 +65,6 @@ typedef enum {
SRPC_MSG_JOIN_REPLY = 17,
} srpc_msg_type_t;
/* CAVEAT EMPTOR:
* All srpc_*_reqst_t's 1st field must be matchbits of reply buffer,
* and 2nd field matchbits of bulk buffer if any.

3
drivers/staging/lustre/lnet/selftest/selftest.h
View file

@ -56,7 +56,6 @@
#define MADE_WITHOUT_COMPROMISE
#endif
#define SWI_STATE_NEWBORN 0
#define SWI_STATE_REPLY_SUBMITTED 1
#define SWI_STATE_REPLY_SENT 2
@ -497,7 +496,6 @@ swi_deschedule_workitem(swi_workitem_t *swi)
return cfs_wi_deschedule(swi->swi_sched, &swi->swi_workitem);
}
int sfw_startup(void);
int srpc_startup(void);
void sfw_shutdown(void);
@ -583,7 +581,6 @@ swi_state2str (int state)
schedule_timeout(cfs_time_seconds(1) / 10); \
} while (0)
#define lst_wait_until(cond, lock, fmt, ...) \
do { \
int __I = 2; \

3
drivers/staging/lustre/lnet/selftest/timer.c
View file

@ -42,7 +42,6 @@
#include "selftest.h"
/*
* Timers are implemented as a sorted queue of expiry times. The queue
* is slotted, with each slot holding timers which expire in a
@ -167,7 +166,6 @@ stt_check_timers(unsigned long *last)
return expired;
}
static int
stt_timer_main(void *arg)
{
@ -204,7 +202,6 @@ stt_start_timer_thread(void)
return 0;
}
int
stt_startup(void)
{

3
drivers/staging/lustre/lustre/include/cl_object.h
View file

@ -2020,7 +2020,6 @@ struct cl_io_slice {
struct list_head cis_linkage;
};
/**
* Per-layer io operations.
* \see vvp_io_ops, lov_io_ops, lovsub_io_ops, osc_io_ops
@ -2294,7 +2293,6 @@ struct cl_io_rw_common {
int crw_nonblock;
};
/**
* State for io.
*
@ -2858,7 +2856,6 @@ int cl_page_flush (const struct lu_env *env, struct cl_io *io,
/** @} transfer */
/**
* \name helper routines
* Functions to discard, delete and export a cl_page.

1
drivers/staging/lustre/lustre/include/lclient.h
View file

@ -71,7 +71,6 @@ enum ccc_setattr_lock_type {
SETATTR_MATCH_LOCK
};
/**
* IO state private to vvp or slp layers.
*/

1
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
View file

@ -61,7 +61,6 @@
#define module_init(a) late_initcall(a)
#endif
#define LTIME_S(time) (time.tv_sec)
#ifndef QUOTA_OK

2
drivers/staging/lustre/lustre/include/linux/lustre_lite.h
View file

@ -39,7 +39,6 @@
#error Do not #include this file directly. #include <lustre_lite.h> instead
#endif
#include <linux/statfs.h>
#include <linux/fs.h>
@ -93,5 +92,4 @@ enum {
LPROC_LL_FILE_OPCODES
};
#endif

1
drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
View file

@ -43,7 +43,6 @@
#include <linux/mm.h>
#include <linux/hash.h>
#define ll_delete_from_page_cache(page) delete_from_page_cache(page)
static inline void

1
drivers/staging/lustre/lustre/include/linux/obd.h
View file

@ -114,7 +114,6 @@ 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)
{
spin_lock_init(&lock->lock);

2
drivers/staging/lustre/lustre/include/lprocfs_status.h
View file

@ -302,7 +302,6 @@ static inline int opcode_offset(__u32 opc)
}
}
#define LUSTRE_MAX_OPCODES (OPC_RANGE(OST) + \
OPC_RANGE(MDS) + \
OPC_RANGE(LDLM) + \
@ -638,7 +637,6 @@ int lprocfs_seq_release(struct inode *, struct file *);
#define LPROCFS_CLIMP_EXIT(obd) \
up_read(&(obd)->u.cli.cl_sem)
/* 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,

4
drivers/staging/lustre/lustre/include/lu_object.h
View file

@ -814,7 +814,6 @@ void lu_object_header_print(const struct lu_env *env, void *cookie,
*/
int lu_object_invariant(const struct lu_object *o);
/**
* Check whether object exists, no matter on local or remote storage.
* Note: LOHA_EXISTS will be set once some one created the object,
@ -1160,7 +1159,6 @@ void *lu_context_key_get (const struct lu_context *ctx,
void lu_context_key_quiesce (struct lu_context_key *key);
void lu_context_key_revive (struct lu_context_key *key);
/*
* LU_KEY_INIT_GENERIC() has to be a macro to correctly determine an
* owning module.
@ -1210,8 +1208,6 @@ void lu_context_key_revive (struct lu_context_key *key);
} \
struct __##mod##_dummy_type_stop {; }
#define LU_TYPE_INIT_FINI(mod, ...) \
LU_TYPE_INIT(mod, __VA_ARGS__); \
LU_TYPE_FINI(mod, __VA_ARGS__); \

1
drivers/staging/lustre/lustre/include/lu_ref.h
View file

@ -107,7 +107,6 @@
* @{
*/
/*
* dummy data structures/functions to pass compile for now.
* We need to reimplement them with kref.

3
drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h
View file

@ -43,8 +43,6 @@
#ifndef _LUSTRE_FIEMAP_H
#define _LUSTRE_FIEMAP_H
struct ll_fiemap_extent {
__u64 fe_logical; /* logical offset in bytes for the start of
* the extent from the beginning of the file */
@ -94,7 +92,6 @@ struct ll_user_fiemap {
* support extents. Result
* merged for efficiency. */
static inline size_t fiemap_count_to_size(size_t extent_count)
{
return (sizeof(struct ll_user_fiemap) + extent_count *

6
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
View file

@ -294,7 +294,6 @@ static inline int range_compare_loc(const struct lu_seq_range *r1,
(range)->lsr_index, \
fld_range_is_mdt(range) ? "mdt" : "ost"
/** \defgroup lu_fid lu_fid
* @{ */
@ -960,7 +959,6 @@ struct luda_type {
#define DTTOIF(dirtype) ((dirtype) << IFSHIFT)
#endif
struct lu_dirpage {
__u64 ldp_hash_start;
__u64 ldp_hash_end;
@ -1274,7 +1272,6 @@ void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
#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 | \
@ -1399,7 +1396,6 @@ struct obd_connect_data {
* the matching OBD_CONNECT flag, so that can be approved and landed easily to
* reserve the flag for future use. */
void lustre_swab_connect(struct obd_connect_data *ocd);
/*
@ -2051,7 +2047,6 @@ typedef enum {
#define MDS_FIRST_OPC MDS_GETATTR
/* opcodes for object update */
typedef enum {
UPDATE_OBJ = 1000,
@ -2117,7 +2112,6 @@ void lustre_swab_generic_32s(__u32 *val);
/* This FULL lock is useful to take on unlink sort of operations */
#define MDS_INODELOCK_FULL ((1<<(MDS_INODELOCK_MAXSHIFT+1))-1)
/* 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). */

4
drivers/staging/lustre/lustre/include/lustre/lustre_user.h
View file

@ -261,7 +261,6 @@ struct ost_id {
#define LL_IOC_OBD_STATFS IOC_OBD_STATFS
#define IOC_MDC_GETSTRIPE IOC_MDC_GETFILESTRIPE
#define MAX_OBD_NAME 128 /* If this changes, a NEW ioctl must be added */
/* Define O_LOV_DELAY_CREATE to be a mask that is not useful for regular
@ -488,7 +487,6 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
&((fid)->f_oid), \
&((fid)->f_ver)
/********* Quotas **********/
/* these must be explicitly translated into linux Q_* in ll_dir_ioctl */
@ -630,7 +628,6 @@ struct lustre_swap_layouts {
__u64 sl_dv2;
};
/********* Changelogs **********/
/** Changelog record types */
enum changelog_rec_type {
@ -845,7 +842,6 @@ struct ioc_data_version {
#define dot_lustre_name ".lustre"
/********* HSM **********/
/** HSM per-file state

1
drivers/staging/lustre/lustre/include/lustre_cfg.h
View file

@ -224,7 +224,6 @@ static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens)
return cfs_size_round(len);
}
#include "obd_support.h"
static inline struct lustre_cfg *lustre_cfg_new(int cmd,

3
drivers/staging/lustre/lustre/include/lustre_disk.h
View file

@ -107,7 +107,6 @@ struct lustre_mount_data {
#define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)
/****************** last_rcvd file *********************/
/** version recovery epoch */
@ -373,7 +372,6 @@ struct lustre_sb_info {
#define get_mount_flags(sb) (s2lsi(sb)->lsi_lmd->lmd_flags)
#define get_mntdev_name(sb) (s2lsi(sb)->lsi_lmd->lmd_dev)
/****************** mount lookup info *********************/
struct lustre_mount_info {
@ -393,7 +391,6 @@ void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb,
void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb));
int lustre_common_put_super(struct super_block *sb);
int mgc_fsname2resid(char *fsname, struct ldlm_res_id *res_id, int type);
/** @} disk */

1
drivers/staging/lustre/lustre/include/lustre_dlm.h
View file

@ -1275,7 +1275,6 @@ int ldlm_cli_cancel_list(struct list_head *head, int count,
int intent_disposition(struct ldlm_reply *rep, int flag);
void intent_set_disposition(struct ldlm_reply *rep, int flag);
/* ioctls for trying requests */
#define IOC_LDLM_TYPE 'f'
#define IOC_LDLM_MIN_NR 40

1
drivers/staging/lustre/lustre/include/lustre_eacl.h
View file

@ -70,7 +70,6 @@ typedef struct {
#define CFS_ACL_XATTR_COUNT(size, prefix) \
(((size) - sizeof(prefix ## _header)) / sizeof(prefix ## _entry))
extern ext_acl_xattr_header *
lustre_posix_acl_xattr_2ext(posix_acl_xattr_header *header, int size);
extern int

1
drivers/staging/lustre/lustre/include/lustre_fld.h
View file

@ -61,7 +61,6 @@ enum {
LUSTRE_CLI_FLD_HASH_RRB
};
struct lu_fld_target {
struct list_head ft_chain;
struct obd_export *ft_exp;

1
drivers/staging/lustre/lustre/include/lustre_ha.h
View file

@ -47,7 +47,6 @@ struct obd_export;
struct obd_device;
struct ptlrpc_request;
int ptlrpc_replay(struct obd_import *imp);
int ptlrpc_resend(struct obd_import *imp);
void ptlrpc_free_committed(struct obd_import *imp);

1
drivers/staging/lustre/lustre/include/lustre_handles.h
View file

@ -50,7 +50,6 @@
#include "../../include/linux/libcfs/libcfs.h"
struct portals_handle_ops {
void (*hop_addref)(void *object);
void (*hop_free)(void *object, int size);

2
drivers/staging/lustre/lustre/include/lustre_import.h
View file

@ -50,7 +50,6 @@
#include "lustre_handles.h"
#include "lustre/lustre_idl.h"
/**
* Adaptive Timeout stuff
*
@ -85,7 +84,6 @@ struct imp_at {
struct adaptive_timeout iat_service_estimate[IMP_AT_MAX_PORTALS];
};
/** @} */
/** Possible import states */

6
drivers/staging/lustre/lustre/include/lustre_lib.h
View file

@ -185,7 +185,6 @@ static inline int obd_ioctl_packlen(struct obd_ioctl_data *data)
return len;
}
static inline int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
{
if (data->ioc_len > OBD_MAX_IOCTL_BUFFER) {
@ -249,7 +248,6 @@ static inline int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
return 0;
}
#include "obd_support.h"
/* function defined in lustre/obdclass/<platform>/<platform>-module.c */
@ -289,7 +287,6 @@ static inline void obd_ioctl_freedata(char *buf, int len)
#define OBD_IOC_READ _IOWR('f', 109, OBD_IOC_DATA_TYPE)
#define OBD_IOC_WRITE _IOWR('f', 110, OBD_IOC_DATA_TYPE)
#define OBD_IOC_STATFS _IOWR('f', 113, OBD_IOC_DATA_TYPE)
#define OBD_IOC_SYNC _IOW ('f', 114, OBD_IOC_DATA_TYPE)
#define OBD_IOC_READ2 _IOWR('f', 115, OBD_IOC_DATA_TYPE)
@ -523,7 +520,6 @@ struct l_wait_info {
sigmask(SIGTERM) | sigmask(SIGQUIT) | \
sigmask(SIGALRM))
/*
* wait for @condition to become true, but no longer than timeout, specified
* by @info.
@ -604,8 +600,6 @@ do { \
remove_wait_queue(&wq, &__wait); \
} while (0)
#define l_wait_event(wq, condition, info) \
({ \
int __ret; \

1
drivers/staging/lustre/lustre/include/lustre_lite.h
View file

@ -55,7 +55,6 @@
#include "lustre/lustre_user.h"
struct lustre_rw_params {
int lrp_lock_mode;
ldlm_policy_data_t lrp_policy;

1
drivers/staging/lustre/lustre/include/lustre_mdc.h
View file

@ -163,7 +163,6 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp,
}
}
struct mdc_cache_waiter {
struct list_head mcw_entry;
wait_queue_head_t mcw_waitq;

2
drivers/staging/lustre/lustre/include/lustre_net.h
View file

@ -46,7 +46,6 @@
* @{
*/
#ifndef _LUSTRE_NET_H
#define _LUSTRE_NET_H
@ -2830,7 +2829,6 @@ int import_set_conn_priority(struct obd_import *imp, struct obd_uuid *uuid);
void client_destroy_import(struct obd_import *imp);
/** @} */
/* ptlrpc/pinger.c */
/**
* Pinger API (client side only)

2
drivers/staging/lustre/lustre/include/lustre_param.h
View file

@ -59,8 +59,6 @@ int class_find_param(char *buf, char *key, char **valp);
int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh);
int class_parse_nid_quiet(char *buf, lnet_nid_t *nid, char **endh);
/****************** User-settable parameter keys *********************/
/* e.g.
tunefs.lustre --param="failover.node=192.168.0.13@tcp0" /dev/sda

5
drivers/staging/lustre/lustre/include/lustre_sec.h
View file

@ -342,7 +342,6 @@ void sptlrpc_conf_client_adapt(struct obd_device *obd);
*/
#define SPTLRPC_MAX_PAYLOAD (1024)
struct vfs_cred {
uint32_t vc_uid;
uint32_t vc_gid;
@ -830,7 +829,6 @@ static inline int sec_is_rootonly(struct ptlrpc_sec *sec)
return (sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_ROOTONLY);
}
struct ptlrpc_svc_ctx {
atomic_t sc_refcount;
struct ptlrpc_sec_policy *sc_policy;
@ -882,7 +880,6 @@ struct ptlrpc_bulk_sec_desc {
__u8 bsd_data[0]; /* policy-specific token */
};
/*
* round size up to next power of 2, for slab allocation.
* @size must be sane (can't overflow after round up)
@ -1026,7 +1023,6 @@ void sptlrpc_req_put_ctx(struct ptlrpc_request *req, int sync);
int sptlrpc_req_refresh_ctx(struct ptlrpc_request *req, long timeout);
void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode);
/* gc */
void sptlrpc_gc_add_sec(struct ptlrpc_sec *sec);
void sptlrpc_gc_del_sec(struct ptlrpc_sec *sec);
@ -1084,7 +1080,6 @@ int sptlrpc_current_user_desc_size(void);
int sptlrpc_pack_user_desc(struct lustre_msg *msg, int offset);
int sptlrpc_unpack_user_desc(struct lustre_msg *req, int offset, int swabbed);
#define CFS_CAP_CHOWN_MASK (1 << CFS_CAP_CHOWN)
#define CFS_CAP_SYS_RESOURCE_MASK (1 << CFS_CAP_SYS_RESOURCE)

1
drivers/staging/lustre/lustre/include/obd_cache.h
View file

@ -35,5 +35,4 @@
#ifndef _OBD_CACHE_H__
#define _OBD_CACHE_H__
#endif

1
drivers/staging/lustre/lustre/include/obd_cksum.h
View file

@ -156,7 +156,6 @@ static inline cksum_type_t cksum_types_supported_server(void)
return ret;
}
/* Select the best checksum algorithm among those supplied in the cksum_types
* input.
*

5
drivers/staging/lustre/lustre/include/obd_class.h
View file

@ -36,7 +36,6 @@
#ifndef __CLASS_OBD_H
#define __CLASS_OBD_H
#include "obd_support.h"
#include "lustre_import.h"
#include "lustre_net.h"
@ -353,7 +352,6 @@ static inline int obd_check_dev_active(struct obd_device *obd)
(export)->exp_md_stats, coffset); \
}
#define OBD_CHECK_MD_OP(obd, op, err) \
do { \
if (!OBT(obd) || !MDP((obd), op)) { \
@ -382,7 +380,6 @@ do { \
} \
} while (0)
#define OBD_CHECK_DT_OP(obd, op, err) \
do { \
if (!OBT(obd) || !OBP((obd), op)) { \
@ -1744,7 +1741,6 @@ static inline int md_revalidate_lock(struct obd_export *exp,
return rc;
}
/* OBD Metadata Support */
int obd_init_caches(void);
@ -1763,7 +1759,6 @@ do { \
OBD_SLAB_FREE_PTR((ptr), obdo_cachep); \
} while (0)
static inline void obdo2fid(struct obdo *oa, struct lu_fid *fid)
{
/* something here */

1
drivers/staging/lustre/lustre/include/obd_support.h
View file

@ -472,7 +472,6 @@ extern char obd_jobid_var[];
#define OBD_FAIL_UPDATE_OBJ_NET 0x1700
#define OBD_FAIL_UPDATE_OBJ_NET_REP 0x1701
/* Assign references to moved code to reduce code changes */
#define OBD_FAIL_PRECHECK(id) CFS_FAIL_PRECHECK(id)
#define OBD_FAIL_CHECK(id) CFS_FAIL_CHECK(id)

1
drivers/staging/lustre/lustre/lclient/lcommon_cl.c
View file

@ -161,7 +161,6 @@ struct lu_context_key ccc_session_key = {
.lct_fini = ccc_session_key_fini
};
/* type constructor/destructor: ccc_type_{init,fini,start,stop}(). */
/* LU_TYPE_INIT_FINI(ccc, &ccc_key, &ccc_session_key); */

1
drivers/staging/lustre/lustre/lclient/lcommon_misc.c
View file

@ -45,7 +45,6 @@
#include "../include/lustre_lite.h"
/* 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

1
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
View file

@ -58,7 +58,6 @@
#include "../include/lustre_lib.h"
#include "ldlm_internal.h"
/* When a lock is cancelled by a client, the KMS may undergo change if this
* is the "highest lock". This function returns the new KMS value.
* Caller must hold lr_lock already.

1
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
View file

@ -580,7 +580,6 @@ void ldlm_flock_policy_wire18_to_local(const ldlm_wire_policy_data_t *wpolicy,
lpolicy->l_flock.owner = wpolicy->l_flock.lfw_pid;
}
void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy)
{

1
drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
View file

@ -58,7 +58,6 @@
#include "../include/lustre_lib.h"
#include "ldlm_internal.h"
void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy)
{

1
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
View file

@ -626,7 +626,6 @@ out_disconnect:
}
EXPORT_SYMBOL(client_disconnect_export);
/**
* Packs current SLV and Limit into \a req.
*/

2
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
View file

@ -154,7 +154,6 @@ EXPORT_SYMBOL(ldlm_it2str);
* REFCOUNTED LOCK OBJECTS
*/
/**
* Get a reference on a lock.
*
@ -1562,7 +1561,6 @@ out:
return rc;
}
/**
* Process a call to blocking AST callback for a lock in ast_work list
*/

4
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View file

@ -443,7 +443,6 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
}
}
int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
struct ldlm_lock *lock)
{
@ -695,7 +694,6 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
return 0;
}
static struct ldlm_bl_work_item *ldlm_bl_get_work(struct ldlm_bl_pool *blp)
{
struct ldlm_bl_work_item *blwi = NULL;
@ -837,7 +835,6 @@ static int ldlm_bl_thread_main(void *arg)
return 0;
}
static int ldlm_setup(void);
static int ldlm_cleanup(void);
@ -989,7 +986,6 @@ static int ldlm_setup(void)
goto out;
}
blp = kzalloc(sizeof(*blp), GFP_NOFS);
if (!blp) {
rc = -ENOMEM;

1
drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
View file

@ -58,7 +58,6 @@
#include "ldlm_internal.h"
void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy)
{

1
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
View file

@ -104,7 +104,6 @@
#include "../include/obd_support.h"
#include "ldlm_internal.h"
/*
* 50 ldlm locks for 1MB of RAM.
*/

1
drivers/staging/lustre/lustre/ldlm/ldlm_request.c
View file

@ -1795,7 +1795,6 @@ static int replay_lock_interpret(const struct lu_env *env,
if (rc != ELDLM_OK)
goto out;
reply = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP);
if (reply == NULL) {
rc = -EPROTO;

2
drivers/staging/lustre/lustre/libcfs/libcfs_lock.c
View file

@ -34,7 +34,6 @@
#include "../../include/linux/libcfs/libcfs.h"
/** destroy cpu-partition lock, see libcfs_private.h for more detail */
void
cfs_percpt_lock_free(struct cfs_percpt_lock *pcl)
@ -146,7 +145,6 @@ cfs_percpt_unlock(struct cfs_percpt_lock *pcl, int index)
}
EXPORT_SYMBOL(cfs_percpt_unlock);
/** free cpu-partition refcount */
void
cfs_percpt_atomic_free(atomic_t **refs)

1
drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c
View file

@ -129,7 +129,6 @@ static struct shash_alg alg = {
}
};
int cfs_crypto_adler32_register(void)
{
return crypto_register_shash(&alg);

2
drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
View file

@ -36,8 +36,6 @@
*/
static int cfs_crypto_hash_speeds[CFS_HASH_ALG_MAX];
static int cfs_crypto_hash_alloc(unsigned char alg_id,
const struct cfs_crypto_hash_type **type,
struct hash_desc *desc, unsigned char *key,

1
drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
View file

@ -62,7 +62,6 @@ int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
return -EINVAL;
}
if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) {
CERROR("PORTALS: user buffer too small for ioctl\n");
return -EINVAL;

1
drivers/staging/lustre/lustre/libcfs/module.c
View file

@ -338,7 +338,6 @@ out:
return err;
}
struct cfs_psdev_ops libcfs_psdev_ops = {
libcfs_psdev_open,
libcfs_psdev_release,

1
drivers/staging/lustre/lustre/libcfs/tracefile.c
View file

@ -39,7 +39,6 @@
* Author: Phil Schwan <phil@clusterfs.com>
*/
#define DEBUG_SUBSYSTEM S_LNET
#define LUSTRE_TRACEFILE_PRIVATE
#include "tracefile.h"

3
drivers/staging/lustre/lustre/libcfs/tracefile.h
View file

@ -65,8 +65,6 @@ void cfs_trace_stop_thread(void);
int cfs_tracefile_init(int max_pages);
void cfs_tracefile_exit(void);
int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
const char __user *usr_buffer, int usr_buffer_nob);
int cfs_trace_copyout_string(char __user *usr_buffer, int usr_buffer_nob,
@ -309,7 +307,6 @@ cfs_trace_put_tcd (struct cfs_trace_cpu_data *tcd)
int cfs_trace_refill_stock(struct cfs_trace_cpu_data *tcd, gfp_t gfp,
struct list_head *stock);
int cfs_tcd_owns_tage(struct cfs_trace_cpu_data *tcd,
struct cfs_trace_page *tage);

4
drivers/staging/lustre/lustre/libcfs/workitem.c
View file

@ -115,7 +115,6 @@ cfs_wi_sched_cansleep(struct cfs_wi_sched *sched)
return 1;
}
/* XXX:
* 0. it only works when called from wi->wi_action.
* 1. when it returns no one shall try to schedule the workitem.
@ -217,7 +216,6 @@ cfs_wi_schedule(struct cfs_wi_sched *sched, cfs_workitem_t *wi)
}
EXPORT_SYMBOL(cfs_wi_schedule);
static int
cfs_wi_scheduler (void *arg)
{
@ -258,7 +256,6 @@ cfs_wi_scheduler (void *arg)
wi->wi_running = 1;
wi->wi_scheduled = 0;
cfs_wi_sched_unlock(sched);
nloops++;
@ -302,7 +299,6 @@ cfs_wi_scheduler (void *arg)
return 0;
}
void
cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
{

1
drivers/staging/lustre/lustre/llite/dcache.c
View file

@ -344,7 +344,6 @@ static int ll_revalidate_nd(struct dentry *dentry, unsigned int flags)
return ll_revalidate_dentry(dentry, flags);
}
static void ll_d_iput(struct dentry *de, struct inode *inode)
{
LASSERT(inode);

2
drivers/staging/lustre/lustre/llite/dir.c
View file

@ -907,7 +907,6 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
hpk.hpk_errval = 0;
hpk.hpk_data_version = 0;
/* For archive request, we need to read the current file version. */
if (copy->hc_hai.hai_action == HSMA_ARCHIVE) {
struct inode *inode;
@ -1047,7 +1046,6 @@ progress:
return rc;
}
static int copy_and_ioctl(int cmd, struct obd_export *exp,
const void __user *data, size_t size)
{

6
drivers/staging/lustre/lustre/llite/file.c
View file

@ -1891,7 +1891,6 @@ int ll_hsm_release(struct inode *inode)
__u64 data_version = 0;
int rc;
CDEBUG(D_INODE, "%s: Releasing file "DFID".\n",
ll_get_fsname(inode->i_sb, NULL, 0),
PFID(&ll_i2info(inode)->lli_fid));
@ -1923,7 +1922,6 @@ int ll_hsm_release(struct inode *inode)
&data_version);
och = NULL;
out:
if (och != NULL && !IS_ERR(och)) /* close the file */
ll_lease_close(och, inode, NULL);
@ -2145,7 +2143,6 @@ static int ll_hsm_import(struct inode *inode, struct file *file,
struct iattr *attr = NULL;
int rc;
if (!S_ISREG(inode->i_mode))
return -EINVAL;
@ -2505,7 +2502,6 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
}
static loff_t ll_file_seek(struct file *file, loff_t offset, int origin)
{
struct inode *inode = file_inode(file);
@ -3071,7 +3067,6 @@ struct posix_acl *ll_get_acl(struct inode *inode, int type)
return acl;
}
int ll_inode_permission(struct inode *inode, int mask)
{
int rc = 0;
@ -3169,7 +3164,6 @@ static struct llioc_ctl_data {
LIST_HEAD_INIT(llioc.ioc_head)
};
struct llioc_data {
struct list_head iocd_list;
unsigned int iocd_size;

2
drivers/staging/lustre/lustre/llite/llite_internal.h
View file

@ -818,7 +818,6 @@ struct ll_close_queue {
struct ccc_object *cl_inode2ccc(struct inode *inode);
void vvp_write_pending (struct ccc_object *club, struct ccc_page *page);
void vvp_write_complete(struct ccc_object *club, struct ccc_page *page);
@ -1273,7 +1272,6 @@ typedef enum llioc_iter (*llioc_callback_t)(struct inode *inode,
void *ll_iocontrol_register(llioc_callback_t cb, int count, unsigned int *cmd);
void ll_iocontrol_unregister(void *magic);
/* lclient compat stuff */
#define cl_inode_info ll_inode_info
#define cl_i2info(info) ll_i2info(info)

2
drivers/staging/lustre/lustre/llite/llite_mmap.c
View file

@ -258,8 +258,6 @@ out:
return result;
}
static inline int to_fault_error(int result)
{
switch (result) {

1
drivers/staging/lustre/lustre/llite/llite_rmtacl.c
View file

@ -178,7 +178,6 @@ void rct_fini(struct rmtacl_ctl_table *rct)
spin_unlock(&rct->rct_lock);
}
static struct eacl_entry *ee_alloc(pid_t key, struct lu_fid *fid, int type,
ext_acl_xattr_header *header)
{

2
drivers/staging/lustre/lustre/llite/lloop.c
View file

@ -315,7 +315,6 @@ static unsigned int loop_get_bio(struct lloop_device *lo, struct bio **req)
if (page_count + (*bio)->bi_vcnt > LLOOP_MAX_SEGMENTS)
break;
page_count += (*bio)->bi_vcnt;
count++;
bio = &(*bio)->bi_next;
@ -370,7 +369,6 @@ err:
bio_io_error(old_bio);
}
static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
{
int ret;

2
drivers/staging/lustre/lustre/llite/lproc_llite.c
View file

@ -960,7 +960,6 @@ int ldebugfs_register_mountpoint(struct dentry *parent,
char name[MAX_STRING_SIZE + 1], *ptr;
int err, id, len, rc;
name[MAX_STRING_SIZE] = '\0';
LASSERT(sbi != NULL);
@ -1050,7 +1049,6 @@ int ldebugfs_register_mountpoint(struct dentry *parent,
if (err)
goto out;
err = ldebugfs_add_vars(sbi->ll_debugfs_entry,
lprocfs_llite_obd_vars, sb);
if (err)

2
drivers/staging/lustre/lustre/llite/namei.c
View file

@ -100,7 +100,6 @@ static int ll_set_inode(struct inode *inode, void *opaque)
return 0;
}
/*
* Get an inode by inode number (already instantiated by the intent lookup).
* Returns inode or NULL
@ -674,7 +673,6 @@ out_release:
return rc;
}
/* We depend on "mode" being set with the proper file type/umask by now */
static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it)
{

3
drivers/staging/lustre/lustre/llite/vvp_dev.c
View file

@ -40,7 +40,6 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "llite_internal.h"
@ -113,7 +112,6 @@ static void vvp_session_key_fini(const struct lu_context *ctx,
OBD_SLAB_FREE_PTR(session, vvp_session_kmem);
}
struct lu_context_key vvp_key = {
.lct_tags = LCT_CL_THREAD,
.lct_init = vvp_key_init,
@ -187,7 +185,6 @@ void vvp_global_fini(void)
lu_kmem_fini(vvp_caches);
}
/*****************************************************************************
*
* mirror obd-devices into cl devices.

1
drivers/staging/lustre/lustre/llite/vvp_internal.h
View file

@ -39,7 +39,6 @@
#ifndef VVP_INTERNAL_H
#define VVP_INTERNAL_H
#include "../include/cl_object.h"
#include "llite_internal.h"

3
drivers/staging/lustre/lustre/llite/vvp_io.c
View file

@ -41,7 +41,6 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include "../include/obd.h"
#include "../include/lustre_lite.h"
@ -643,7 +642,6 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
return -EINVAL;
}
static int vvp_io_fault_start(const struct lu_env *env,
const struct cl_io_slice *ios)
{
@ -702,7 +700,6 @@ static int vvp_io_fault_start(const struct lu_env *env,
goto out;
}
if (fio->ft_mkwrite) {
pgoff_t last_index;
/*

1
drivers/staging/lustre/lustre/llite/vvp_lock.c
View file

@ -38,7 +38,6 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include "../include/obd.h"
#include "../include/lustre_lite.h"

1
drivers/staging/lustre/lustre/llite/vvp_object.c
View file

@ -40,7 +40,6 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include "../../include/linux/libcfs/libcfs.h"
#include "../include/obd.h"

1
drivers/staging/lustre/lustre/llite/vvp_page.c
View file

@ -41,7 +41,6 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include "../include/obd.h"
#include "../include/lustre_lite.h"

18
drivers/staging/lustre/lustre/llite/xattr_cache.c
View file

@ -58,7 +58,6 @@ void ll_xattr_fini(void)
static void ll_xattr_cache_init(struct ll_inode_info *lli)
{
LASSERT(lli != NULL);
INIT_LIST_HEAD(&lli->lli_xattrs);
@ -80,8 +79,6 @@ static int ll_xattr_cache_find(struct list_head *cache,
{
struct ll_xattr_entry *entry;
list_for_each_entry(entry, cache, xe_list) {
/* xattr_name == NULL means look for any entry */
if (xattr_name == NULL ||
@ -113,8 +110,6 @@ static int ll_xattr_cache_add(struct list_head *cache,
{
struct ll_xattr_entry *xattr;
if (ll_xattr_cache_find(cache, xattr_name, &xattr) == 0) {
CDEBUG(D_CACHE, "duplicate xattr: [%s]\n", xattr_name);
return -EPROTO;
@ -164,8 +159,6 @@ static int ll_xattr_cache_del(struct list_head *cache,
{
struct ll_xattr_entry *xattr;
CDEBUG(D_CACHE, "del xattr: %s\n", xattr_name);
if (ll_xattr_cache_find(cache, xattr_name, &xattr) == 0) {
@ -197,8 +190,6 @@ static int ll_xattr_cache_list(struct list_head *cache,
struct ll_xattr_entry *xattr, *tmp;
int xld_tail = 0;
list_for_each_entry_safe(xattr, tmp, cache, xe_list) {
CDEBUG(D_CACHE, "list: buffer=%p[%d] name=%s\n",
xld_buffer, xld_tail, xattr->xe_name);
@ -240,7 +231,6 @@ static int ll_xattr_cache_valid(struct ll_inode_info *lli)
static int ll_xattr_cache_destroy_locked(struct ll_inode_info *lli)
{
if (!ll_xattr_cache_valid(lli))
return 0;
@ -256,8 +246,6 @@ int ll_xattr_cache_destroy(struct inode *inode)
struct ll_inode_info *lli = ll_i2info(inode);
int rc;
down_write(&lli->lli_xattrs_list_rwsem);
rc = ll_xattr_cache_destroy_locked(lli);
up_write(&lli->lli_xattrs_list_rwsem);
@ -292,8 +280,6 @@ static int ll_xattr_find_get_lock(struct inode *inode,
struct obd_export *exp = sbi->ll_md_exp;
int rc;
mutex_lock(&lli->lli_xattrs_enq_lock);
/* inode may have been shrunk and recreated, so data is gone, match lock
* only when data exists. */
@ -359,8 +345,6 @@ static int ll_xattr_cache_refill(struct inode *inode, struct lookup_intent *oit)
__u32 *xsizes;
int rc, i;
rc = ll_xattr_find_get_lock(inode, oit, &req);
if (rc)
goto out_no_unlock;
@ -495,8 +479,6 @@ int ll_xattr_cache_get(struct inode *inode,
struct ll_inode_info *lli = ll_i2info(inode);
int rc = 0;
LASSERT(!!(valid & OBD_MD_FLXATTR) ^ !!(valid & OBD_MD_FLXATTRLS));
down_read(&lli->lli_xattrs_list_rwsem);

4
drivers/staging/lustre/lustre/lmv/lmv_obd.c
View file

@ -863,9 +863,6 @@ static int lmv_hsm_ct_register(struct lmv_obd *lmv, unsigned int cmd, int len,
return rc;
}
static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
int len, void *karg, void *uarg)
{
@ -1588,7 +1585,6 @@ static int lmv_find_cbdata(struct obd_export *exp, const struct lu_fid *fid,
return rc;
}
static int lmv_close(struct obd_export *exp, struct md_op_data *op_data,
struct md_open_data *mod, struct ptlrpc_request **request)
{

2
drivers/staging/lustre/lustre/lov/lov_cl_internal.h
View file

@ -438,7 +438,6 @@ struct lovsub_page {
struct cl_page_slice lsb_cl;
};
struct lov_thread_info {
struct cl_object_conf lti_stripe_conf;
struct lu_fid lti_fid;
@ -611,7 +610,6 @@ int lov_sublock_modify(const struct lu_env *env, struct lov_lock *lov,
struct lovsub_lock *sublock,
const struct cl_lock_descr *d, int idx);
int lov_page_init(const struct lu_env *env, struct cl_object *ob,
struct cl_page *page, struct page *vmpage);
int lovsub_page_init(const struct lu_env *env, struct cl_object *ob,

1
drivers/staging/lustre/lustre/lov/lov_dev.c
View file

@ -46,7 +46,6 @@
#include "lov_cl_internal.h"
#include "lov_internal.h"
struct kmem_cache *lov_lock_kmem;
struct kmem_cache *lov_object_kmem;
struct kmem_cache *lov_thread_kmem;

1
drivers/staging/lustre/lustre/lov/lov_internal.h
View file

@ -269,5 +269,4 @@ static inline bool lov_oinfo_is_dummy(const struct lov_oinfo *loi)
return false;
}
#endif

2
drivers/staging/lustre/lustre/lov/lov_io.c
View file

@ -271,7 +271,6 @@ struct lov_io_sub *lov_page_subio(const struct lu_env *env, struct lov_io *lio,
return lov_sub_get(env, lio, stripe);
}
static int lov_io_subio_init(const struct lu_env *env, struct lov_io *lio,
struct cl_io *io)
{
@ -545,7 +544,6 @@ static void lov_io_unlock(const struct lu_env *env,
LASSERT(rc == 0);
}
static struct cl_page_list *lov_io_submit_qin(struct lov_device *ld,
struct cl_page_list *qin,
int idx, int alloc)

2
drivers/staging/lustre/lustre/lov/lov_lock.c
View file

@ -678,7 +678,6 @@ static int lov_lock_unuse(const struct lu_env *env,
return result;
}
static void lov_lock_cancel(const struct lu_env *env,
const struct cl_lock_slice *slice)
{
@ -1196,5 +1195,4 @@ static struct cl_lock_closure *lov_closure_get(const struct lu_env *env,
return closure;
}
/** @} lov */

2
drivers/staging/lustre/lustre/lov/lov_obd.c
View file

@ -122,7 +122,6 @@ static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid,
static int lov_notify(struct obd_device *obd, struct obd_device *watched,
enum obd_notify_event ev, void *data);
#define MAX_STRING_SIZE 128
int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,
struct obd_connect_data *data)
@ -170,7 +169,6 @@ int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,
return rc;
}
if (imp->imp_invalid) {
CDEBUG(D_CONFIG, "not connecting OSC %s; administratively disabled\n",
obd_uuid2str(tgt_uuid));

2
drivers/staging/lustre/lustre/lov/lov_pack.c
View file

@ -253,7 +253,6 @@ __u16 lov_get_stripecnt(struct lov_obd *lov, __u32 magic, __u16 stripe_count)
return stripe_count;
}
static int lov_verify_lmm(void *lmm, int lmm_bytes, __u16 *stripe_count)
{
int rc;
@ -327,7 +326,6 @@ int lov_free_memmd(struct lov_stripe_md **lsmp)
return refc;
}
/* Unpack LOV object metadata from disk storage. It is packed in LE byte
* order and is opaque to the networking layer.
*/

2
drivers/staging/lustre/lustre/lov/lov_page.c
View file

@ -208,7 +208,6 @@ out:
return rc;
}
static const struct cl_page_operations lov_empty_page_ops = {
.cpo_fini = lov_empty_page_fini,
.cpo_print = lov_page_print
@ -228,5 +227,4 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
return 0;
}
/** @} lov */

3
drivers/staging/lustre/lustre/lov/lov_pool.c
View file

@ -397,7 +397,6 @@ int lov_ost_pool_free(struct ost_pool *op)
return 0;
}
int lov_pool_new(struct obd_device *obd, char *poolname)
{
struct lov_obd *lov;
@ -509,7 +508,6 @@ int lov_pool_del(struct obd_device *obd, char *poolname)
return 0;
}
int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
{
struct obd_uuid ost_uuid;
@ -526,7 +524,6 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
obd_str2uuid(&ost_uuid, ostname);
/* search ost in lov array */
obd_getref(obd);
for (lov_idx = 0; lov_idx < lov->desc.ld_tgt_count; lov_idx++) {

1
drivers/staging/lustre/lustre/lov/lovsub_dev.c
View file

@ -205,5 +205,4 @@ struct lu_device_type lovsub_device_type = {
.ldt_ctx_tags = LCT_CL_THREAD
};
/** @} lov */

2
drivers/staging/lustre/lustre/lov/lovsub_object.c
View file

@ -120,8 +120,6 @@ static int lovsub_object_glimpse(const struct lu_env *env,
return cl_object_glimpse(env, &los->lso_super->lo_cl, lvb);
}
static const struct cl_object_operations lovsub_ops = {
.coo_page_init = lovsub_page_init,
.coo_lock_init = lovsub_lock_init,

2
drivers/staging/lustre/lustre/mdc/mdc_lib.c
View file

@ -39,7 +39,6 @@
#include "../include/lustre/lustre_idl.h"
#include "mdc_internal.h"
static void __mdc_pack_body(struct mdt_body *b, __u32 suppgid)
{
LASSERT(b != NULL);
@ -120,7 +119,6 @@ void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
CLASSERT(sizeof(struct mdt_rec_reint) == sizeof(struct mdt_rec_create));
rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
rec->cr_opcode = REINT_CREATE;
rec->cr_fsuid = uid;
rec->cr_fsgid = gid;

Some files were not shown because too many files have changed in this diff Show more