Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5814 llite: add cl_object_maxbytes()
[fs/lustre-release.git]
/
lustre
/
include
/
obd.h
diff --git
a/lustre/include/obd.h
b/lustre/include/obd.h
index
f65f804
..
71f1662
100644
(file)
--- a/
lustre/include/obd.h
+++ b/
lustre/include/obd.h
@@
-96,7
+96,7
@@
struct lov_stripe_md {
/* maximum possible file size, might change as OSTs status changes,
* e.g. disconnected, deactivated */
/* maximum possible file size, might change as OSTs status changes,
* e.g. disconnected, deactivated */
-
__u64
lsm_maxbytes;
+
loff_t
lsm_maxbytes;
struct ost_id lsm_oi;
__u32 lsm_magic;
__u32 lsm_stripe_size;
struct ost_id lsm_oi;
__u32 lsm_magic;
__u32 lsm_stripe_size;
@@
-152,7
+152,7
@@
struct obd_info {
/* statfs data specific for every OSC, if needed at all. */
struct obd_statfs *oi_osfs;
/* An update callback which is called to update some data on upper
/* statfs data specific for every OSC, if needed at all. */
struct obd_statfs *oi_osfs;
/* An update callback which is called to update some data on upper
-
* level. E.g. it is used for update lsm->lsm_oinfo at every recie
ved
+
* level. E.g. it is used for update lsm->lsm_oinfo at every recei
ved
* request in osc level for enqueue requests. It is also possible to
* update some caller data from LOV layer if needed. */
obd_enqueue_update_f oi_cb_up;
* request in osc level for enqueue requests. It is also possible to
* update some caller data from LOV layer if needed. */
obd_enqueue_update_f oi_cb_up;
@@
-815,6
+815,14
@@
static inline int it_to_lock_mode(struct lookup_intent *it)
return -EINVAL;
}
return -EINVAL;
}
+enum md_op_flags {
+ MF_MDC_CANCEL_FID1 = 1 << 0,
+ MF_MDC_CANCEL_FID2 = 1 << 1,
+ MF_MDC_CANCEL_FID3 = 1 << 2,
+ MF_MDC_CANCEL_FID4 = 1 << 3,
+ MF_GET_MDT_IDX = 1 << 4,
+};
+
enum md_cli_flags {
CLI_SET_MEA = 1 << 0,
CLI_RM_ENTRY = 1 << 1,
enum md_cli_flags {
CLI_SET_MEA = 1 << 0,
CLI_RM_ENTRY = 1 << 1,
@@
-899,9
+907,7
@@
struct obd_ops {
int (*o_iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
void *karg, void __user *uarg);
int (*o_get_info)(const struct lu_env *env, struct obd_export *,
int (*o_iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
void *karg, void __user *uarg);
int (*o_get_info)(const struct lu_env *env, struct obd_export *,
- __u32 keylen, void *key,
- __u32 *vallen, void *val,
- struct lov_stripe_md *lsm);
+ __u32 keylen, void *key, __u32 *vallen, void *val);
int (*o_set_info_async)(const struct lu_env *, struct obd_export *,
__u32 keylen, void *key,
__u32 vallen, void *val,
int (*o_set_info_async)(const struct lu_env *, struct obd_export *,
__u32 keylen, void *key,
__u32 vallen, void *val,
@@
-957,18
+963,13
@@
struct obd_ops {
struct obdo *oa, struct obd_trans_info *oti);
int (*o_setattr)(const struct lu_env *, struct obd_export *exp,
struct obd_info *oinfo, struct obd_trans_info *oti);
struct obdo *oa, struct obd_trans_info *oti);
int (*o_setattr)(const struct lu_env *, struct obd_export *exp,
struct obd_info *oinfo, struct obd_trans_info *oti);
- int (*o_setattr_async)(struct obd_export *exp, struct obd_info *oinfo,
- struct obd_trans_info *oti,
- struct ptlrpc_request_set *rqset);
int (*o_getattr)(const struct lu_env *env, struct obd_export *exp,
struct obd_info *oinfo);
int (*o_getattr)(const struct lu_env *env, struct obd_export *exp,
struct obd_info *oinfo);
- int (*o_getattr_async)(struct obd_export *exp, struct obd_info *oinfo,
- struct ptlrpc_request_set *set);
int (*o_preprw)(const struct lu_env *env, int cmd,
struct obd_export *exp, struct obdo *oa, int objcount,
struct obd_ioobj *obj, struct niobuf_remote *remote,
int (*o_preprw)(const struct lu_env *env, int cmd,
struct obd_export *exp, struct obdo *oa, int objcount,
struct obd_ioobj *obj, struct niobuf_remote *remote,
-
int *nr_pages, struct niobuf_local *local,
-
struct obd_trans_info *oti, struct lustre_capa *capa
);
+ int *nr_pages, struct niobuf_local *local,
+
struct obd_trans_info *oti
);
int (*o_commitrw)(const struct lu_env *env, int cmd,
struct obd_export *exp, struct obdo *oa,
int objcount, struct obd_ioobj *obj,
int (*o_commitrw)(const struct lu_env *env, int cmd,
struct obd_export *exp, struct obdo *oa,
int objcount, struct obd_ioobj *obj,
@@
-1221,7
+1222,7
@@
static inline struct md_open_data *obd_mod_alloc(void)
} \
})
} \
})
-void obdo_from_inode(struct obdo *dst, struct inode *src, u
32
valid);
+void obdo_from_inode(struct obdo *dst, struct inode *src, u
64
valid);
void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent);
/* return 1 if client should be resend request */
void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent);
/* return 1 if client should be resend request */
@@
-1269,7
+1270,7
@@
static inline bool filename_is_volatile(const char *name, size_t namelen,
}
/* we have an idx, read it */
start = name + LUSTRE_VOLATILE_HDR_LEN + 1;
}
/* we have an idx, read it */
start = name + LUSTRE_VOLATILE_HDR_LEN + 1;
- *idx = strtoul(start, &end, 16);
+ *idx = s
imple_s
trtoul(start, &end, 16);
/* error cases:
* no digit, no trailing :, negative value
*/
/* error cases:
* no digit, no trailing :, negative value
*/