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-1030 clio: reimplement ll_fsync in clio way
[fs/lustre-release.git]
/
lustre
/
include
/
obd_ost.h
diff --git
a/lustre/include/obd_ost.h
b/lustre/include/obd_ost.h
index
b849ff0
..
17d9c03
100644
(file)
--- a/
lustre/include/obd_ost.h
+++ b/
lustre/include/obd_ost.h
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,8
+24,10
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-53,18
+53,26
@@
struct osc_brw_async_args {
int aa_resends;
struct brw_page **aa_ppga;
struct client_obd *aa_cli;
int aa_resends;
struct brw_page **aa_ppga;
struct client_obd *aa_cli;
- struct list_head aa_oaps;
+ cfs_list_t aa_oaps;
+ struct obd_capa *aa_ocapa;
struct cl_req *aa_clerq;
};
struct cl_req *aa_clerq;
};
+#define osc_grant_args osc_brw_async_args
struct osc_async_args {
struct obd_info *aa_oi;
};
struct osc_async_args {
struct obd_info *aa_oi;
};
-struct osc_punch_args {
- struct obdo *pa_oa;
- obd_enqueue_update_f pa_upcall;
- void *pa_cookie;
+struct osc_setattr_args {
+ struct obdo *sa_oa;
+ obd_enqueue_update_f sa_upcall;
+ void *sa_cookie;
+};
+
+struct osc_fsync_args {
+ struct obd_info *fa_oi;
+ obd_enqueue_update_f fa_upcall;
+ void *fa_cookie;
};
struct osc_enqueue_args {
};
struct osc_enqueue_args {
@@
-75,6
+83,7
@@
struct osc_enqueue_args {
struct ost_lvb *oa_lvb;
struct lustre_handle *oa_lockh;
struct ldlm_enqueue_info *oa_ei;
struct ost_lvb *oa_lvb;
struct lustre_handle *oa_lockh;
struct ldlm_enqueue_info *oa_ei;
+ unsigned int oa_agl:1;
};
#if 0
};
#if 0
@@
-83,6
+92,7
@@
int osc_extent_blocking_cb(struct ldlm_lock *lock,
int flag);
#endif
int flag);
#endif
+#define POSTID LPU64":"LPU64
/**
* Build DLM resource name from object id & group for osc-ost extent lock.
*/
/**
* Build DLM resource name from object id & group for osc-ost extent lock.
*/