#ifndef _OSD_INTERNAL_H
#define _OSD_INTERNAL_H
-#if defined(__KERNEL__)
+/* struct mutex */
+#include <linux/mutex.h>
/* struct rw_semaphore */
#include <linux/rwsem.h>
/* struct dentry */
#include <linux/dcache.h>
/* struct dirent64 */
#include <linux/dirent.h>
-
+#include <linux/statfs.h>
#include <ldiskfs/ldiskfs.h>
#include <ldiskfs/ldiskfs_jbd2.h>
/* OI scrub should skip this inode. */
#define LDISKFS_STATE_LUSTRE_NOSCRUB 31
-/* Do not add OI mapping for this inode. */
-#define LDISKFS_STATE_LUSTRE_NO_OI 30
-
/** Enable thandle usage statistics */
#define OSD_THANDLE_STATS (0)
struct dentry *oos_root; /* O/<seq> */
struct dentry **oos_dirs; /* O/<seq>/d0-dXX */
obd_seq oos_seq; /* seq number */
- cfs_list_t oos_seq_list; /* list to seq_list */
+ struct list_head oos_seq_list; /* list to seq_list */
};
struct osd_obj_map {
struct dentry *om_root; /* dentry for /O */
rwlock_t om_seq_list_lock; /* lock for seq_list */
- cfs_list_t om_seq_list; /* list head for seq */
+ struct list_head om_seq_list; /* list head for seq */
int om_subdir_count;
- struct semaphore om_dir_init_sem;
+ struct mutex om_dir_init_mutex;
};
struct osd_mdobj {
struct dentry *om_root; /* AGENT/<index> */
- obd_seq om_index; /* mdt index */
- cfs_list_t om_list; /* list to omm_list */
+ obd_seq om_index; /* mdt index */
+ struct list_head om_list; /* list to omm_list */
};
struct osd_mdobj_map {
struct osd_inconsistent_item {
/* link into osd_scrub::os_inconsistent_items,
* protected by osd_scrub::os_lock. */
- cfs_list_t oii_list;
+ struct list_head oii_list;
/* The right FID <=> ino#/gen mapping. */
struct osd_idmap_cache oii_cache;
unsigned long od_capa_timeout;
__u32 od_capa_alg;
struct lustre_capa_key *od_capa_keys;
- cfs_hlist_head_t *od_capa_hash;
+ struct hlist_head *od_capa_hash;
- cfs_proc_dir_entry_t *od_proc_entry;
+ struct proc_dir_entry *od_proc_entry;
struct lprocfs_stats *od_stats;
- /*
- * statfs optimization: we cache a bit.
- */
- cfs_time_t od_osfs_age;
- struct obd_statfs od_statfs;
+
spinlock_t od_osfs_lock;
int od_connects;
struct osd_obj_map *od_ost_map;
struct osd_mdobj_map *od_mdt_map;
- unsigned long long od_readcache_max_filesize;
- int od_read_cache;
- int od_writethrough_cache;
+ unsigned long long od_readcache_max_filesize;
+ int od_read_cache;
+ int od_writethrough_cache;
- struct brw_stats od_brw_stats;
- cfs_atomic_t od_r_in_flight;
- cfs_atomic_t od_w_in_flight;
+ struct brw_stats od_brw_stats;
+ atomic_t od_r_in_flight;
+ atomic_t od_w_in_flight;
struct mutex od_otable_mutex;
struct osd_otable_it *od_otable_it;
struct osd_scrub od_scrub;
- cfs_list_t od_ios_list;
+ struct list_head od_ios_list;
/* service name associated with the osd device */
char od_svname[MAX_OBD_NAME];
/* quota slave instance */
struct qsd_instance *od_quota_slave;
+
+ /* osd seq instance */
+ struct lu_client_seq *od_cl_seq;
};
/* There are at most 10 uid/gids are affected in a transaction, and
struct thandle ot_super;
handle_t *ot_handle;
struct ldiskfs_journal_cb_entry ot_jcb;
- cfs_list_t ot_dcb_list;
+ struct list_head ot_dcb_list;
/* Link to the device, for debugging. */
struct lu_ref_link ot_dev_link;
unsigned short ot_credits;
DTO_OBJECT_DELETE,
DTO_ATTR_SET_BASE,
DTO_XATTR_SET,
- DTO_LOG_REC, /**< XXX temporary: dt layer knows nothing about llog. */
DTO_WRITE_BASE,
DTO_WRITE_BLOCK,
DTO_ATTR_SET_CHOWN,
};
struct osd_quota_leaf {
- cfs_list_t oql_link;
+ struct list_head oql_link;
uint oql_blk;
};
/** the record index in the leaf/index block */
uint oiq_index[LUSTRE_DQTREEDEPTH + 1];
/** list of already processed leaf blocks */
- cfs_list_t oiq_list;
+ struct list_head oiq_list;
};
#define MAX_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / 512)
struct osd_iobuf {
wait_queue_head_t dr_wait;
- cfs_atomic_t dr_numreqs; /* number of reqs being processed */
+ atomic_t dr_numreqs; /* number of reqs being processed */
int dr_max_pages;
int dr_npages;
int dr_error;
int oti_txns;
/** used in osd_fid_set() to put xattr */
struct lu_buf oti_buf;
+ struct lu_buf oti_big_buf;
/** used in osd_ea_fid_set() to set fid into common ea */
union {
struct lustre_mdt_attrs oti_mdt_attrs;
#ifdef LPROCFS
/* osd_lproc.c */
-void lprocfs_osd_init_vars(struct lprocfs_static_vars *lvars);
+extern struct lprocfs_seq_vars lprocfs_osd_obd_vars[];
+extern struct lprocfs_seq_vars lprocfs_osd_module_vars[];
int osd_procfs_init(struct osd_device *osd, const char *name);
int osd_procfs_fini(struct osd_device *osd);
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf);
const struct lu_fid *fid, struct osd_inode_id *id);
int osd_obj_map_insert(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th);
+ handle_t *th);
int osd_obj_map_delete(struct osd_thread_info *info, struct osd_device *osd,
- const struct lu_fid *fid, struct thandle *th);
+ const struct lu_fid *fid, handle_t *th);
int osd_obj_map_update(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th);
+ handle_t *th);
int osd_obj_map_recover(struct osd_thread_info *info, struct osd_device *osd,
struct inode *src_parent, struct dentry *src_child,
const struct lu_fid *fid);
const struct lu_fid *fid, struct osd_inode_id *id);
int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th);
+ handle_t *th);
int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th);
+ handle_t *th);
void osd_scrub_file_reset(struct osd_scrub *scrub, __u8 *uuid, __u64 flags);
int osd_scrub_file_store(struct osd_scrub *scrub);
int insert);
int osd_oii_lookup(struct osd_device *dev, const struct lu_fid *fid,
struct osd_inode_id *id);
-int osd_scrub_dump(struct osd_device *dev, char *buf, int len);
+int osd_scrub_dump(struct seq_file *m, struct osd_device *dev);
int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
obd_seq seq, struct lu_seq_range *range);
struct osd_it_quota *it);
/* osd_quota.c */
int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh,
- struct lquota_id_info *qi, bool allocated, int *flags);
+ struct lquota_id_info *qi, struct osd_object *obj,
+ bool enforce, int *flags);
int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid,
long long space, struct osd_thandle *oh,
- bool is_blk, bool allocated, int *flags, bool force);
+ struct osd_object *obj, bool is_blk, int *flags,
+ bool force);
const struct dt_rec *osd_quota_pack(struct osd_object *obj,
const struct dt_rec *rec,
union lquota_rec *quota_rec);
feat == &dt_quota_bgrp_features) ? true : false;
}
+#ifndef HAVE_I_UID_READ
+static inline uid_t i_uid_read(const struct inode *inode)
+{
+ return inode->i_uid;
+}
+
+static inline gid_t i_gid_read(const struct inode *inode)
+{
+ return inode->i_gid;
+}
+
+static inline void i_uid_write(struct inode *inode, uid_t uid)
+{
+ inode->i_uid = uid;
+}
+
+static inline void i_gid_write(struct inode *inode, gid_t gid)
+{
+ inode->i_gid = gid;
+}
+#endif
+
/*
* Invariants, assertions.
*/
LASSERT(oh->ot_handle == NULL);
if (unlikely(op >= OSD_OT_MAX)) {
- if (unlikely(ldiskfs_track_declares_assert))
+ if (unlikely(ldiskfs_track_declares_assert)) {
LASSERT(op < OSD_OT_MAX);
- else {
+ } else {
CWARN("%s: Invalid operation index %d\n",
osd_name(oti->oti_dev), op);
libcfs_debug_dumpstack(NULL);
return (!fid_is_namespace_visible(fid) && !fid_is_idif(fid));
}
+static inline unsigned long osd_remote_parent_ino(struct osd_device *dev)
+{
+ return dev->od_mdt_map->omm_remote_parent->d_inode->i_ino;
+}
+
#ifdef JOURNAL_START_HAS_3ARGS
# define osd_journal_start_sb(sb, type, nblock) \
ldiskfs_journal_start_sb(sb, type, nblock)
# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
ldiskfs_find_entry(dir, name, de, inlined, lock)
# define osd_journal_start(inode, type, nblocks) \
- ldiskfs_journal_start(inode, type, nblocks);
+ ldiskfs_journal_start(inode, type, nblocks)
+# define osd_transaction_size(dev) \
+ (osd_journal(dev)->j_max_transaction_buffers / 2)
#else
# define LDISKFS_HT_MISC 0
# define osd_journal_start_sb(sb, type, nblock) \
# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
ldiskfs_find_entry(dir, name, de, lock)
# define osd_journal_start(inode, type, nblocks) \
- ldiskfs_journal_start(inode, nblocks);
+ ldiskfs_journal_start(inode, nblocks)
+# define osd_transaction_size(dev) \
+ (osd_journal(dev)->j_max_transaction_buffers)
#endif
void ldiskfs_inc_count(handle_t *handle, struct inode *inode);
void ldiskfs_dec_count(handle_t *handle, struct inode *inode);
-#endif /* __KERNEL__ */
+void osd_fini_iobuf(struct osd_device *d, struct osd_iobuf *iobuf);
+
#endif /* _OSD_INTERNAL_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff