/* SYNCHRONOUS I/O to object storage for an inode */
static int ll_brw(int rw, struct inode *inode, struct page *page, int create)
{
- obd_count num_obdo = 1;
- obd_count bufs_per_obdo = 1;
- struct obdo *oa;
+ struct ll_inode_info *lii = ll_i2info(inode);
+ struct lov_stripe_md *md = lii->lli_smd;
obd_size count = PAGE_SIZE;
obd_off offset = ((obd_off)page->index) << PAGE_SHIFT;
obd_flag flags = create ? OBD_BRW_CREATE : 0;
int err;
ENTRY;
- oa = ll_i2info(inode)->lli_obdo;
- err = obd_brw(rw, ll_i2obdconn(inode), num_obdo, &oa, &bufs_per_obdo,
- &page, &count, &offset, &flags, NULL);
+ err = obd_brw(rw, ll_i2obdconn(inode), md, 1,
+ &page, &count, &offset, &flags, NULL, NULL);
RETURN(err);
} /* ll_brw */
* to date until commit_write */
if (from == 0 && to == PAGE_SIZE)
RETURN(0);
+
+ /* prepare write should not read what lies beyond the end of
+ the file */
+
rc = ll_brw(OBD_BRW_READ, inode, page, 0);
{
int create = 1;
struct inode *inode = page->mapping->host;
- obd_count num_obdo = 1;
- obd_count bufs_per_obdo = 1;
- struct obdo *oa;
+ struct ll_inode_info *lii = ll_i2info(inode);
+ struct lov_stripe_md *md = lii->lli_smd;
obd_size count = to;
obd_off offset = (((obd_off)page->index) << PAGE_SHIFT);
obd_flag flags = create ? OBD_BRW_CREATE : 0;
struct iattr iattr;
ENTRY;
- oa = ll_i2info(inode)->lli_obdo;
SetPageUptodate(page);
if (!PageLocked(page))
LBUG();
- CDEBUG(D_INODE, "commit_page writing (at %d) to %d, count %Ld\n",
+ CDEBUG(D_INODE, "commit_page writing (at %d) to %d, count %Ld\n",
from, to, (unsigned long long)count);
- err = obd_brw(OBD_BRW_WRITE, ll_i2obdconn(inode), num_obdo, &oa,
- &bufs_per_obdo, &page, &count, &offset, &flags, NULL);
+ err = obd_brw(OBD_BRW_WRITE, ll_i2obdconn(inode), md,
+ 1, &page, &count, &offset, &flags, NULL, NULL);
kunmap(page);
iattr.ia_size = offset + to;
void ll_truncate(struct inode *inode)
{
- struct obdo *oa;
+ struct obdo oa = {0};
+ struct lov_stripe_md *md = ll_i2info(inode)->lli_smd;
int err;
ENTRY;
- oa = ll_i2info(inode)->lli_obdo;
- if (!oa) {
+ if (!md) {
/* object not yet allocated */
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
return;
}
+
CDEBUG(D_INFO, "calling punch for %ld (all bytes after %Ld)\n",
- (long)oa->o_id, (unsigned long long)oa->o_size);
- oa->o_size = inode->i_size;
- oa->o_valid = OBD_MD_FLSIZE | OBD_MD_FLID;
- /* truncate == punch from i_size onwards */
- err = obd_punch(ll_i2obdconn(inode), oa, -1 - oa->o_size, oa->o_size);
+ (long)oa.o_id, (unsigned long long)oa.o_size);
+
+ oa.o_size = inode->i_size;
+ oa.o_id = md->lmd_object_id;
+ oa.o_valid = OBD_MD_FLID;
+ /* truncate == punch to/from start from/to end:
+ set end to -1 for that. */
+ err = obd_punch(ll_i2obdconn(inode), &oa, md, oa.o_size,
+ 0xffffffffffffffff);
if (err)
CERROR("obd_truncate fails (%d)\n", err);
else
int ll_direct_IO(int rw, struct inode *inode, struct kiobuf *iobuf,
unsigned long blocknr, int blocksize)
{
- int i;
- obd_count num_obdo = 1;
obd_count bufs_per_obdo = iobuf->nr_pages;
- struct obdo *oa = NULL;
+ struct ll_inode_info *lii = ll_i2info(inode);
+ struct lov_stripe_md *md = lii->lli_smd;
obd_size *count = NULL;
obd_off *offset = NULL;
obd_flag *flags = NULL;
int rc = 0;
+ int i;
ENTRY;
if (blocksize != PAGE_SIZE) {
- CERROR("direct_IO blocksize != PAGE_SIZE, what to do?\n");
- LBUG();
+ CERROR("direct_IO blocksize != PAGE_SIZE\n");
+ return -EINVAL;
}
- OBD_ALLOC(count, sizeof(obd_size) * bufs_per_obdo);
- OBD_ALLOC(offset, sizeof(obd_off) * bufs_per_obdo);
- OBD_ALLOC(flags, sizeof(obd_flag) * bufs_per_obdo);
+ OBD_ALLOC(count, sizeof(*count) * bufs_per_obdo);
+ OBD_ALLOC(offset, sizeof(*offset) * bufs_per_obdo);
+ OBD_ALLOC(flags, sizeof(*flags) * bufs_per_obdo);
if (!count || !offset || !flags)
GOTO(out, rc = -ENOMEM);
flags[i] = OBD_BRW_CREATE;
}
- oa = ll_i2info(inode)->lli_obdo;
- if (!oa)
+ if (!md || !md->lmd_object_id)
GOTO(out, rc = -ENOMEM);
+
rc = obd_brw(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
- ll_i2obdconn(inode), num_obdo, &oa, &bufs_per_obdo,
- iobuf->maplist, count, offset, flags, NULL);
+ ll_i2obdconn(inode), md, bufs_per_obdo,
+ iobuf->maplist, count, offset, flags, NULL, NULL);
if (rc == 0)
rc = bufs_per_obdo * PAGE_SIZE;
- out:
- if (flags)
- OBD_FREE(flags, sizeof(obd_flag) * bufs_per_obdo);
- if (count)
- OBD_FREE(count, sizeof(obd_count) * bufs_per_obdo);
- if (offset)
- OBD_FREE(offset, sizeof(obd_off) * bufs_per_obdo);
+out:
+ OBD_FREE(flags, sizeof(obd_flag) * bufs_per_obdo);
+ OBD_FREE(count, sizeof(obd_count) * bufs_per_obdo);
+ OBD_FREE(offset, sizeof(obd_off) * bufs_per_obdo);
RETURN(rc);
}
int ll_flush_inode_pages(struct inode * inode)
{
- //int i;
- // obd_count num_obdo = 1;
obd_count bufs_per_obdo = 0;
- struct obdo *oa = NULL;
obd_size *count = NULL;
obd_off *offset = NULL;
obd_flag *flags = NULL;
spin_unlock(&pagecache_lock);
- OBD_ALLOC(count, sizeof(obd_size) * bufs_per_obdo);
- if (!count)
- GOTO(out, err=-ENOMEM);
-
- OBD_ALLOC(offset, sizeof(obd_off) * bufs_per_obdo);
- if (!offset)
- GOTO(out, err=-ENOMEM);
-
- OBD_ALLOC(flags, sizeof(obd_flag) * bufs_per_obdo);
- if (!flags)
- GOTO(out, err=-ENOMEM);
+ OBD_ALLOC(count, sizeof(*count) * bufs_per_obdo);
+ OBD_ALLOC(offset, sizeof(*offset) * bufs_per_obdo);
+ OBD_ALLOC(flags, sizeof(*flags) * bufs_per_obdo);
+ if (!count || !offset || !flags)
+ GOTO(out, err=-ENOMEM);
#if 0
- for (i = 0 ; i < bufs_per_obdo ; i++) {
+ for (i = 0 ; i < bufs_per_obdo ; i++) {
count[i] = PAGE_SIZE;
offset[i] = ((obd_off)(iobuf->maplist[i])->index) << PAGE_SHIFT;
flags[i] = OBD_BRW_CREATE;
}
- oa = ll_oa_from_inode(inode, OBD_MD_FLNOTOBD);
- if (!oa)
- RETURN(-ENOMEM);
-
- err = obd_brw(rw, ll_i2obdconn(inode), num_obdo, &oa, &bufs_per_obdo,
- iobuf->maplist, count, offset, flags);
- if (err == 0)
+ err = obd_brw(OBD_BRW_WRITE, ll_i2obdconn(inode),
+ ll_i2info(inode)->lli_smd, bufs_per_obdo,
+ iobuf->maplist, count, offset, flags, NULL, NULL);
+ if (err == 0)
err = bufs_per_obdo * 4096;
#endif
out:
- if (oa)
- obdo_free(oa);
- if (flags)
- OBD_FREE(flags, sizeof(obd_flag) * bufs_per_obdo);
- if (count)
- OBD_FREE(count, sizeof(obd_count) * bufs_per_obdo);
- if (offset)
- OBD_FREE(offset, sizeof(obd_off) * bufs_per_obdo);
+ OBD_FREE(flags, sizeof(*flags) * bufs_per_obdo);
+ OBD_FREE(count, sizeof(*count) * bufs_per_obdo);
+ OBD_FREE(offset, sizeof(*offset) * bufs_per_obdo);
RETURN(err);
}
direct_IO: ll_direct_IO,
#endif
sync_page: block_sync_page,
- prepare_write: ll_prepare_write,
+ prepare_write: ll_prepare_write,
commit_write: ll_commit_write,
bmap: NULL
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff