Branch HEAD

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 3f111f9..30a3f7f 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -642,7 +642,7 @@ static inline int obd_checkmd(struct obd_export *exp,
         RETURN(rc);
 }
 
-static inline int obd_precreate(struct obd_export *exp, int need_create)
+static inline int obd_precreate(struct obd_export *exp)
 {
         int rc;
         ENTRY;
@@ -650,7 +650,7 @@ static inline int obd_precreate(struct obd_export *exp, int need_create)
         EXP_CHECK_DT_OP(exp, precreate);
         OBD_COUNTER_INCREMENT(exp->exp_obd, precreate);
 
-        rc = OBP(exp->exp_obd, precreate)(exp, need_create);
+        rc = OBP(exp->exp_obd, precreate)(exp);
         RETURN(rc);
 }
 
@@ -814,7 +814,8 @@ static inline int obd_connect(const struct lu_env *env,
         RETURN(rc);
 }
 
-static inline int obd_reconnect(struct obd_export *exp,
+static inline int obd_reconnect(const struct lu_env *env,
+                                struct obd_export *exp,
                                 struct obd_device *obd,
                                 struct obd_uuid *cluuid,
                                 struct obd_connect_data *d)
@@ -831,7 +832,7 @@ static inline int obd_reconnect(struct obd_export *exp,
         OBD_CHECK_DT_OP(obd, reconnect, 0);
         OBD_COUNTER_INCREMENT(obd, reconnect);
 
-        rc = OBP(obd, reconnect)(exp, obd, cluuid, d);
+        rc = OBP(obd, reconnect)(env, exp, obd, cluuid, d);
         /* check that only subset is granted */
         LASSERT(ergo(d != NULL,
                      (d->ocd_connect_flags & ocf) == d->ocd_connect_flags));
@@ -1007,7 +1008,7 @@ static inline int obd_statfs_async(struct obd_device *obd,
 
 static inline int obd_statfs_rqset(struct obd_device *obd,
                                    struct obd_statfs *osfs, __u64 max_age,
-                                   int quick_pry)
+                                   __u32 flags)
 {
         struct ptlrpc_request_set *set = NULL;
         struct obd_info oinfo = { { { 0 } } };
@@ -1019,20 +1020,10 @@ static inline int obd_statfs_rqset(struct obd_device *obd,
                 RETURN(-ENOMEM);
 
         oinfo.oi_osfs = osfs;
+        oinfo.oi_flags = flags;
         rc = obd_statfs_async(obd, &oinfo, max_age, set);
-        if (rc == 0) {
-                struct ptlrpc_request *req;
-
-                if (quick_pry)
-                        list_for_each_entry(req, &set->set_requests,
-                                            rq_set_chain) {
-                                spin_lock(&req->rq_lock);
-                                req->rq_no_resend = 1;
-                                req->rq_no_delay  = 1;
-                                spin_unlock(&req->rq_lock);
-                        }
+        if (rc == 0)
                 rc = ptlrpc_set_wait(set);
-        }
         ptlrpc_set_destroy(set);
         RETURN(rc);
 }
@@ -1041,7 +1032,7 @@ static inline int obd_statfs_rqset(struct obd_device *obd,
  * If the cache is older than @max_age we will get a new value from the
  * target.  Use a value of "cfs_time_current() + HZ" to guarantee freshness. */
 static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs,
-                             __u64 max_age)
+                             __u64 max_age, __u32 flags)
 {
         int rc = 0;
         ENTRY;
@@ -1055,7 +1046,7 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs,
         CDEBUG(D_SUPER, "osfs "LPU64", max_age "LPU64"\n",
                obd->obd_osfs_age, max_age);
         if (cfs_time_before_64(obd->obd_osfs_age, max_age)) {
-                rc = OBP(obd, statfs)(obd, osfs, max_age);
+                rc = OBP(obd, statfs)(obd, osfs, max_age, flags);
                 if (rc == 0) {
                         spin_lock(&obd->obd_osfs_lock);
                         memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs));
@@ -1751,7 +1742,7 @@ static inline int md_enqueue(struct obd_export *exp,
 static inline int md_getattr_name(struct obd_export *exp,
                                   const struct lu_fid *fid, struct obd_capa *oc,
                                   const char *name, int namelen,
-                                  obd_valid valid, int ea_size,
+                                  obd_valid valid, int ea_size, __u32 suppgid,
                                   struct ptlrpc_request **request)
 {
         int rc;
@@ -1759,7 +1750,7 @@ static inline int md_getattr_name(struct obd_export *exp,
         EXP_CHECK_MD_OP(exp, getattr_name);
         EXP_MD_COUNTER_INCREMENT(exp, getattr_name);
         rc = MDP(exp->exp_obd, getattr_name)(exp, fid, oc, name, namelen,
-                                             valid, ea_size, request);
+                                             valid, ea_size, suppgid, request);
         RETURN(rc);
 }
 
@@ -1868,15 +1859,14 @@ static inline int md_unlink(struct obd_export *exp, struct md_op_data *op_data,
 
 static inline int md_get_lustre_md(struct obd_export *exp,
                                    struct ptlrpc_request *req,
-                                   int offset, struct obd_export *dt_exp,
+                                   struct obd_export *dt_exp,
                                    struct obd_export *md_exp,
                                    struct lustre_md *md)
 {
         ENTRY;
         EXP_CHECK_MD_OP(exp, get_lustre_md);
         EXP_MD_COUNTER_INCREMENT(exp, get_lustre_md);
-        RETURN(MDP(exp->exp_obd, get_lustre_md)(exp, req, offset,
-                                                dt_exp, md_exp, md));
+        RETURN(MDP(exp->exp_obd, get_lustre_md)(exp, req, dt_exp, md_exp, md));
 }
 
 static inline int md_free_lustre_md(struct obd_export *exp,
@@ -1892,7 +1882,7 @@ static inline int md_setxattr(struct obd_export *exp,
                               const struct lu_fid *fid, struct obd_capa *oc,
                               obd_valid valid, const char *name,
                               const char *input, int input_size,
-                              int output_size, int flags,
+                              int output_size, int flags, __u32 suppgid,
                               struct ptlrpc_request **request)
 {
         ENTRY;
@@ -1900,7 +1890,7 @@ static inline int md_setxattr(struct obd_export *exp,
         EXP_MD_COUNTER_INCREMENT(exp, setxattr);
         RETURN(MDP(exp->exp_obd, setxattr)(exp, fid, oc, valid, name, input,
                                            input_size, output_size, flags,
-                                           request));
+                                           suppgid, request));
 }
 
 static inline int md_getxattr(struct obd_export *exp,
@@ -1988,13 +1978,14 @@ static inline int md_init_ea_size(struct obd_export *exp, int easize,
 
 static inline int md_get_remote_perm(struct obd_export *exp,
                                      const struct lu_fid *fid,
-                                     struct obd_capa *oc,
+                                     struct obd_capa *oc, __u32 suppgid,
                                      struct ptlrpc_request **request)
 {
         ENTRY;
         EXP_CHECK_MD_OP(exp, get_remote_perm);
         EXP_MD_COUNTER_INCREMENT(exp, get_remote_perm);
-        RETURN(MDP(exp->exp_obd, get_remote_perm)(exp, fid, oc, request));
+        RETURN(MDP(exp->exp_obd, get_remote_perm)(exp, fid, oc, suppgid,
+                                                  request));
 }
 
 static inline int md_renew_capa(struct obd_export *exp, struct obd_capa *ocapa,