#include "llite_internal.h"
#include <linux/lustre_compat25.h>
-/* called for each page in a completed rpc.*/
-void ll_ap_completion_24(void *data, int cmd, int rc)
-{
- struct ll_async_page *llap;
- struct page *page;
-
- llap = llap_from_cookie(data);
- if (IS_ERR(llap)) {
- EXIT;
- return;
- }
-
- page = llap->llap_page;
- LASSERT(PageLocked(page));
-
- if (rc == 0) {
- if (cmd == OBD_BRW_READ) {
- if (!llap->llap_defer_uptodate)
- SetPageUptodate(page);
- } else {
- llap->llap_write_queued = 0;
- }
- } else {
- SetPageError(page);
- }
-
- LL_CDEBUG_PAGE(page, "io complete, unlocking\n");
-
- unlock_page(page);
-
- if (0 && cmd == OBD_BRW_WRITE) {
- llap_write_complete(page->mapping->host, llap);
- ll_try_done_writing(page->mapping->host);
- }
-
- page_cache_release(page);
-}
-
-static int ll_writepage_24(struct page *page)
-{
- struct inode *inode = page->mapping->host;
- struct obd_export *exp;
- struct ll_async_page *llap;
- int rc = 0;
- ENTRY;
-
- LASSERT(!PageDirty(page));
- LASSERT(PageLocked(page));
-
- exp = ll_i2obdexp(inode);
- if (exp == NULL)
- GOTO(out, rc = -EINVAL);
-
- llap = llap_from_page(page);
- if (IS_ERR(llap))
- GOTO(out, rc = PTR_ERR(llap));
-
- page_cache_get(page);
- if (llap->llap_write_queued) {
- LL_CDEBUG_PAGE(page, "marking urgent\n");
- rc = obd_set_async_flags(exp, ll_i2info(inode)->lli_smd, NULL,
- llap->llap_cookie, ASYNC_READY |
- ASYNC_URGENT);
- } else {
- llap->llap_write_queued = 1;
- rc = obd_queue_async_io(exp, ll_i2info(inode)->lli_smd, NULL,
- llap->llap_cookie, OBD_BRW_WRITE, 0, 0,
- OBD_BRW_CREATE, ASYNC_READY |
- ASYNC_URGENT);
- if (rc == 0)
- LL_CDEBUG_PAGE(page, "mmap write queued\n");
- else
- llap->llap_write_queued = 0;
- }
- if (rc)
- page_cache_release(page);
-out:
- if (rc)
- unlock_page(page);
- RETURN(rc);
-}
-
+#ifdef HAVE_DIO_FILE
+static int ll_direct_IO_24(int rw, struct file *file, struct kiobuf *iobuf,
+ unsigned long blocknr, int blocksize)
+#else
static int ll_direct_IO_24(int rw, struct inode *inode, struct kiobuf *iobuf,
unsigned long blocknr, int blocksize)
+#endif
{
+#ifdef HAVE_DIO_FILE
+ struct inode *inode = file->f_dentry->d_inode;
+#endif
struct ll_inode_info *lli = ll_i2info(inode);
struct lov_stripe_md *lsm = lli->lli_smd;
struct brw_page *pga;
struct ptlrpc_request_set *set;
- struct obdo oa;
+ struct obdo *oa = NULL;
int length, i, flags, rc = 0;
loff_t offset;
ENTRY;
if (!lsm || !lsm->lsm_object_id)
RETURN(-EBADF);
- /* FIXME: io smaller than PAGE_SIZE is broken on ia64 */
- if ((iobuf->offset & (PAGE_SIZE - 1)) ||
- (iobuf->length & (PAGE_SIZE - 1)))
- RETURN(-EINVAL);
-
set = ptlrpc_prep_set();
if (set == NULL)
RETURN(-ENOMEM);
RETURN(-ENOMEM);
}
- flags = (rw == WRITE ? OBD_BRW_CREATE : 0) /* | OBD_BRW_DIRECTIO */;
- offset = ((obd_off)blocknr << inode->i_blkbits);
+ flags = 0 /* | OBD_BRW_DIRECTIO */;
+ offset = ((obd_off)blocknr * blocksize);
length = iobuf->length;
+ pga[0].page_offset = iobuf->offset;
+ LASSERT(iobuf->offset < PAGE_SIZE);
for (i = 0, length = iobuf->length; length > 0;
length -= pga[i].count, offset += pga[i].count, i++) { /*i last!*/
pga[i].pg = iobuf->maplist[i];
- pga[i].off = offset;
+ pga[i].disk_offset = offset;
/* To the end of the page, or the length, whatever is less */
- pga[i].count = min_t(int, PAGE_SIZE - (offset & ~PAGE_MASK),
+ pga[i].count = min_t(int, PAGE_SIZE - pga[i].page_offset,
length);
pga[i].flag = flags;
if (rw == READ)
POISON_PAGE(iobuf->maplist[i], 0x0d);
}
- ll_inode_fill_obdo(inode, rw, &oa);
+ oa = obdo_alloc();
+ if (oa == NULL) {
+ ptlrpc_set_destroy(set);
+ GOTO(out_free_pga, -ENOMEM);
+ }
+ ll_inode_fill_obdo(inode, rw, oa);
if (rw == WRITE)
lprocfs_counter_add(ll_i2sbi(inode)->ll_stats,
lprocfs_counter_add(ll_i2sbi(inode)->ll_stats,
LPROC_LL_DIRECT_READ, iobuf->length);
rc = obd_brw_async(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
- ll_i2obdexp(inode), &oa, lsm, iobuf->nr_pages, pga,
+ ll_i2dtexp(inode), oa, lsm, iobuf->nr_pages, pga,
set, NULL);
if (rc) {
CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,
CERROR("error from callback: rc = %d\n", rc);
}
ptlrpc_set_destroy(set);
+ if (rc == 0 && rw == WRITE) {
+ void lov_increase_kms(struct obd_export *,
+ struct lov_stripe_md *, obd_off size);
+ obd_off size = offset + length;
+ lov_increase_kms(ll_i2dtexp(inode), lsm, size);
+ if (size > inode->i_size)
+ inode->i_size = size;
+ }
if (rc == 0) {
rc = iobuf->length;
- obdo_to_inode(inode, &oa, OBD_MD_FLBLOCKS);
+ obdo_to_inode(inode, oa, OBD_MD_FLBLOCKS);
}
-
+ obdo_free(oa);
+ EXIT;
+out_free_pga:
OBD_FREE(pga, sizeof(*pga) * iobuf->nr_pages);
- RETURN(rc);
+ return rc;
}
struct address_space_operations ll_aops = {
- readpage: ll_readpage,
- direct_IO: ll_direct_IO_24,
- writepage: ll_writepage_24,
- prepare_write: ll_prepare_write,
- commit_write: ll_commit_write,
- removepage: ll_removepage,
- sync_page: ll_sync_page,
- bmap: NULL
+ .readpage = ll_readpage,
+ .direct_IO = ll_direct_IO_24,
+ .writepage = ll_writepage,
+ .prepare_write = ll_prepare_write,
+ .commit_write = ll_commit_write,
+ .removepage = ll_removepage,
+ .sync_page = NULL,
+ .bmap = NULL
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff