X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Fmgs_internal.h;h=4c77ed3fc5d132e0aeda5de2235907a3a0959f21;hb=708bc9a21e4437a163e60492a0813a9bdf85dd29;hp=a4c6373eac67da3f3172edc7e7d10ae52b7e2460;hpb=4c01e64e0a72c1682ebf0a8bd4cccf99fd04cd88;p=fs%2Flustre-release.git diff --git a/lustre/mgs/mgs_internal.h b/lustre/mgs/mgs_internal.h index a4c6373..4c77ed3 100644 --- a/lustre/mgs/mgs_internal.h +++ b/lustre/mgs/mgs_internal.h @@ -71,7 +71,6 @@ struct fs_db { cfs_semaphore_t fsdb_sem; void *fsdb_ost_index_map; /* bitmap of used indicies */ void *fsdb_mdt_index_map; /* bitmap of used indicies */ - int fsdb_mdt_count; /* COMPAT_146 these items must be recorded out of the old client log */ char *fsdb_clilov; /* COMPAT_146 client lov name */ char *fsdb_clilmv; @@ -82,6 +81,8 @@ struct fs_db { __u32 fsdb_flags; __u32 fsdb_gen; + __u8 fsdb_revoking_lock; /* lock is being revoked */ + /* in-memory copy of the srpc rules, guarded by fsdb_sem */ struct sptlrpc_rule_set fsdb_srpc_gen; struct mgs_tgt_srpc_conf *fsdb_srpc_tgt; @@ -97,8 +98,10 @@ int mgs_find_or_make_fsdb(struct obd_device *obd, char *name, int mgs_get_fsdb_srpc_from_llog(struct obd_device *obd, struct fs_db *fsdb); int mgs_check_index(struct obd_device *obd, struct mgs_target_info *mti); int mgs_check_failnid(struct obd_device *obd, struct mgs_target_info *mti); -int mgs_write_log_target(struct obd_device *obd, struct mgs_target_info *mti); -int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti); +int mgs_write_log_target(struct obd_device *obd, struct mgs_target_info *mti, + struct fs_db *fsdb); +int mgs_upgrade_sv_14(struct obd_device *obd, struct mgs_target_info *mti, + struct fs_db *fsdb); int mgs_erase_log(struct obd_device *obd, char *name); int mgs_erase_logs(struct obd_device *obd, char *fsname); int mgs_setparam(struct obd_device *obd, struct lustre_cfg *lcfg, char *fsname); @@ -106,6 +109,9 @@ int mgs_setparam(struct obd_device *obd, struct lustre_cfg *lcfg, char *fsname); int mgs_pool_cmd(struct obd_device *obd, enum lcfg_command_type cmd, char *poolname, char *fsname, char *ostname); +/* mgs_handler.c */ +void mgs_revoke_lock(struct obd_device *obd, struct fs_db *fsdb); + /* mgs_fs.c */ int mgs_client_add(struct obd_device *obd, struct obd_export *exp, void *localdata);