#include "llite_internal.h"
#include <linux/lustre_compat25.h>
-static int ll_direct_IO_24(int rw,
#ifdef HAVE_DIO_FILE
- struct file *file,
+static int ll_direct_IO_24(int rw, struct file *file, struct kiobuf *iobuf,
+ unsigned long blocknr, int blocksize)
#else
- struct inode *inode,
+static int ll_direct_IO_24(int rw, struct inode *inode, struct kiobuf *iobuf,
+ unsigned long blocknr, int blocksize)
#endif
- struct kiobuf *iobuf, unsigned long blocknr,
- int blocksize)
{
#ifdef HAVE_DIO_FILE
struct inode *inode = file->f_dentry->d_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;
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_i2obdexp(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);
+ if (rw == WRITE)
+ obd_adjust_kms(ll_i2dtexp(inode), lsm, offset, 0);
}
-
+ obdo_free(oa);
+ EXIT;
+out_free_pga:
OBD_FREE(pga, sizeof(*pga) * iobuf->nr_pages);
- RETURN(rc);
+ return rc;
}
+#ifdef KERNEL_HAS_AS_MAX_READAHEAD
+static int ll_max_readahead(struct inode *inode)
+{
+ return 0;
+}
+#endif
+
struct address_space_operations ll_aops = {
.readpage = ll_readpage,
.direct_IO = ll_direct_IO_24,
.commit_write = ll_commit_write,
.removepage = ll_removepage,
.sync_page = NULL,
- .bmap = NULL
+ .bmap = NULL,
+#ifdef KERNEL_HAS_AS_MAX_READAHEAD
+ .max_readahead = ll_max_readahead,
+#endif
};