#define DEBUG_SUBSYSTEM S_LLITE
-#include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
+#include <lustre_lite.h>
#include "llite_internal.h"
/* record that a write is in flight */
{
struct ll_inode_info *lli = ll_i2info(inode);
spin_lock(&lli->lli_lock);
- if (!list_empty(&llap->llap_pending_write))
- list_del_init(&llap->llap_pending_write);
+ list_del_init(&llap->llap_pending_write);
spin_unlock(&lli->lli_lock);
}
if (list_empty(&lli->lli_close_item)) {
CDEBUG(D_INODE, "adding inode %lu/%u to close list\n",
inode->i_ino, inode->i_generation);
- LASSERT(igrab(inode) == inode);
+ igrab(inode);
list_add_tail(&lli->lli_close_item, &lcq->lcq_list);
wake_up(&lcq->lcq_waitq);
}
struct ll_inode_info *lli = ll_i2info(inode);
ldlm_policy_data_t policy = { .l_extent = {0, OBD_OBJECT_EOF } };
struct lustre_handle lockh = { 0 };
- struct obdo *obdo = NULL;
+ struct obdo obdo;
+ obd_flag valid;
int rc, ast_flags = 0;
- obd_valid valid;
ENTRY;
- obdo = obdo_alloc();
- if (obdo == NULL) {
- CERROR("cannot allocate obdo, error %d\n",
- -ENOMEM);
- EXIT;
- return;
- }
-
+ memset(&obdo, 0, sizeof(obdo));
if (test_bit(LLI_F_HAVE_OST_SIZE_LOCK, &lli->lli_flags))
goto rpc;
rc = ll_extent_lock(NULL, inode, lli->lli_smd, LCK_PW, &policy, &lockh,
- ast_flags, &ll_i2sbi(inode)->ll_done_stime);
+ ast_flags);
if (rc != 0) {
CERROR("lock acquisition failed (%d): unable to send "
"DONE_WRITING for inode %lu/%u\n", rc, inode->i_ino,
GOTO(out, rc);
}
- rc = ll_lsm_getattr(ll_i2dtexp(inode), lli->lli_smd, obdo);
+ rc = ll_lsm_getattr(ll_i2obdexp(inode), lli->lli_smd, &obdo);
if (rc) {
CERROR("inode_getattr failed (%d): unable to send DONE_WRITING "
"for inode %lu/%u\n", rc, inode->i_ino,
GOTO(out, rc);
}
- obdo_refresh_inode(inode, obdo, valid);
+ obdo_refresh_inode(inode, &obdo, valid);
CDEBUG(D_INODE, "objid "LPX64" size %Lu, blocks %lu, blksize %lu\n",
lli->lli_smd->lsm_object_id, inode->i_size, inode->i_blocks,
- inode->i_blksize);
+ 1<<inode->i_blkbits);
set_bit(LLI_F_HAVE_OST_SIZE_LOCK, &lli->lli_flags);
if (rc != ELDLM_OK)
CERROR("unlock failed (%d)? proceeding anyways...\n", rc);
-rpc:
- obdo->o_id = inode->i_ino;
- obdo->o_size = inode->i_size;
- obdo->o_blocks = inode->i_blocks;
- obdo->o_valid = OBD_MD_FLID | OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
+ rpc:
+ obdo.o_id = inode->i_ino;
+ obdo.o_size = inode->i_size;
+ obdo.o_blocks = inode->i_blocks;
+ obdo.o_valid = OBD_MD_FLID | OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
- rc = md_done_writing(ll_i2sbi(inode)->ll_mdc_exp, obdo);
-out:
- obdo_free(obdo);
+ rc = mdc_done_writing(ll_i2sbi(inode)->ll_mdc_exp, &obdo);
+ out:
}
#endif
struct ll_close_queue *lcq = arg;
ENTRY;
- /* XXX boiler-plate */
{
- char name[sizeof(current->comm)];
- unsigned long flags;
+ char name[CFS_CURPROC_COMM_MAX];
snprintf(name, sizeof(name) - 1, "ll_close");
- kportal_daemonize(name);
- SIGNAL_MASK_LOCK(current, flags);
- sigfillset(¤t->blocked);
- RECALC_SIGPENDING;
- SIGNAL_MASK_UNLOCK(current, flags);
+ cfs_daemonize(name);
}
-
+
complete(&lcq->lcq_comp);
while (1) {