LU-2675 lov: remove unused lov obd functions

[fs/lustre-release.git] / lustre / liblustre / rw.c

diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index 2fefc31..0e49174 100644 (file)
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -149,60 +149,6 @@ iput:
         RETURN(0);
 }
 
-static int llu_glimpse_callback(struct ldlm_lock *lock, void *reqp)
-{
-       struct ptlrpc_request *req = reqp;
-       struct inode *inode = llu_inode_from_lock(lock);
-       struct llu_inode_info *lli;
-       struct ost_lvb *lvb;
-       struct lov_stripe_md *lsm;
-        int rc, stripe = 0;
-        ENTRY;
-
-        if (inode == NULL)
-                GOTO(out, rc = -ELDLM_NO_LOCK_DATA);
-        lli = llu_i2info(inode);
-        if (lli == NULL)
-                GOTO(iput, rc = -ELDLM_NO_LOCK_DATA);
-
-        req_capsule_extend(&req->rq_pill, &RQF_LDLM_GL_CALLBACK);
-       if (exp_connect_lvb_type(req->rq_export))
-               req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
-                                    sizeof(*lvb));
-       else
-               req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
-                                    sizeof(struct ost_lvb_v1));
-        rc = req_capsule_server_pack(&req->rq_pill);
-        if (rc) {
-                CERROR("failed pack reply: %d\n", rc);
-                GOTO(iput, rc);
-        }
-
-       lsm = ccc_inode_lsm_get(inode);
-       if (lsm == NULL)
-               GOTO(iput, rc = -ELDLM_NO_LOCK_DATA);
-
-        /* First, find out which stripe index this lock corresponds to. */
-       stripe = llu_lock_to_stripe_offset(llu_i2obdexp(inode), lsm, lock);
-
-       lvb = req_capsule_server_get(&req->rq_pill, &RMF_DLM_LVB);
-       lvb->lvb_size = lsm->lsm_oinfo[stripe]->loi_kms;
-       ccc_inode_lsm_put(inode, lsm);
-
-        LDLM_DEBUG(lock, "i_size: "LPU64" -> stripe number %u -> kms "LPU64,
-                   (__u64)llu_i2stat(inode)->st_size, stripe,lvb->lvb_size);
- iput:
-        I_RELE(inode);
- out:
-        /* These errors are normal races, so we don't want to fill the console
-         * with messages by calling ptlrpc_error() */
-        if (rc == -ELDLM_NO_LOCK_DATA)
-                lustre_pack_reply(req, 1, NULL, NULL);
-
-        req->rq_status = rc;
-        return rc;
-}
-
 int llu_merge_lvb(const struct lu_env *env, struct inode *inode)
 {
        struct llu_inode_info *lli = llu_i2info(inode);
@@ -242,83 +188,6 @@ int llu_merge_lvb(const struct lu_env *env, struct inode *inode)
        RETURN(rc);
 }
 
-int llu_extent_lock(struct ll_file_data *fd, struct inode *inode,
-                    struct lov_stripe_md *lsm, int mode,
-                    ldlm_policy_data_t *policy, struct lustre_handle *lockh,
-                    int ast_flags)
-{
-        struct llu_sb_info *sbi = llu_i2sbi(inode);
-        struct intnl_stat *st = llu_i2stat(inode);
-        struct ldlm_enqueue_info einfo = { 0 };
-        struct obd_info oinfo = { { { 0 } } };
-        struct ost_lvb lvb;
-        int rc;
-        ENTRY;
-
-        LASSERT(!lustre_handle_is_used(lockh));
-        CLASSERT(ELDLM_OK == 0);
-
-        /* XXX phil: can we do this?  won't it screw the file size up? */
-        if ((fd && (fd->fd_flags & LL_FILE_IGNORE_LOCK)) ||
-            (sbi->ll_flags & LL_SBI_NOLCK) || mode == LCK_NL)
-                RETURN(0);
-
-        CDEBUG(D_DLMTRACE, "Locking inode "LPU64", start "LPU64" end "LPU64"\n",
-               (__u64)st->st_ino, policy->l_extent.start,
-               policy->l_extent.end);
-
-        einfo.ei_type = LDLM_EXTENT;
-        einfo.ei_mode = mode;
-        einfo.ei_cb_bl = llu_extent_lock_cancel_cb;
-        einfo.ei_cb_cp = ldlm_completion_ast;
-        einfo.ei_cb_gl = llu_glimpse_callback;
-        einfo.ei_cbdata = inode;
-
-        oinfo.oi_policy = *policy;
-        oinfo.oi_lockh = lockh;
-        oinfo.oi_md = lsm;
-        oinfo.oi_flags = ast_flags;
-
-        rc = obd_enqueue(sbi->ll_dt_exp, &oinfo, &einfo, NULL);
-        *policy = oinfo.oi_policy;
-        if (rc > 0)
-                rc = -EIO;
-
-        inode_init_lvb(inode, &lvb);
-        obd_merge_lvb(sbi->ll_dt_exp, lsm, &lvb, 1);
-        if (policy->l_extent.start == 0 &&
-            policy->l_extent.end == OBD_OBJECT_EOF)
-                st->st_size = lvb.lvb_size;
-
-        if (rc == 0) {
-                st->st_mtime = lvb.lvb_mtime;
-                st->st_atime = lvb.lvb_atime;
-                st->st_ctime = lvb.lvb_ctime;
-        }
-
-        RETURN(rc);
-}
-
-int llu_extent_unlock(struct ll_file_data *fd, struct inode *inode,
-                struct lov_stripe_md *lsm, int mode,
-                struct lustre_handle *lockh)
-{
-        struct llu_sb_info *sbi = llu_i2sbi(inode);
-        int rc;
-        ENTRY;
-
-        CLASSERT(ELDLM_OK == 0);
-
-        /* XXX phil: can we do this?  won't it screw the file size up? */
-        if ((fd && (fd->fd_flags & LL_FILE_IGNORE_LOCK)) ||
-            (sbi->ll_flags & LL_SBI_NOLCK) || mode == LCK_NL)
-                RETURN(0);
-
-        rc = obd_cancel(sbi->ll_dt_exp, lsm, mode, lockh);
-
-        RETURN(rc);
-}
-
 static
 ssize_t llu_file_prwv(const struct iovec *iovec, int iovlen,
                         _SYSIO_OFF_T pos, ssize_t len,