* along with Lustre; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+#ifdef HAVE_KERNEL_CONFIG_H
#include <linux/config.h>
+#endif
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/string.h>
#define DEBUG_SUBSYSTEM S_LLITE
-#include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
+#include <lustre_lite.h>
#include "llite_internal.h"
#include <linux/lustre_compat25.h>
-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(D_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,
- 0, ASYNC_READY | ASYNC_URGENT);
- if (rc == 0)
- LL_CDEBUG_PAGE(D_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);
-}
-
static int ll_direct_IO_24(int rw,
#ifdef HAVE_DIO_FILE
struct file *file,
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;
int length, i, flags, rc = 0;
loff_t offset;
if (!lsm || !lsm->lsm_object_id)
RETURN(-EBADF);
- set = ptlrpc_prep_set();
- if (set == NULL)
- RETURN(-ENOMEM);
+ offset = ((obd_off)blocknr << inode->i_blkbits);
+ CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size="LPSZ
+ ", offset=%lld=%llx, pages %u\n",
+ inode->i_ino, inode->i_generation, inode, iobuf->length,
+ offset, offset, iobuf->nr_pages);
+
+ /* FIXME: io smaller than CFS_PAGE_SIZE is broken on ia64 */
+ if ((iobuf->offset & (~CFS_PAGE_MASK)) ||
+ (iobuf->length & (~CFS_PAGE_MASK)))
+ RETURN(-EINVAL);
OBD_ALLOC(pga, sizeof(*pga) * iobuf->nr_pages);
- if (!pga) {
- ptlrpc_set_destroy(set);
+ if (!pga)
RETURN(-ENOMEM);
- }
flags = 0 /* | OBD_BRW_DIRECTIO */;
- offset = ((obd_off)blocknr * blocksize);
length = iobuf->length;
- LASSERT(iobuf->offset < PAGE_SIZE);
+ rw = rw ? OBD_BRW_WRITE : OBD_BRW_READ;
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;
/* 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, CFS_PAGE_SIZE - (offset & ~CFS_PAGE_MASK),
length);
pga[i].flag = flags;
- if (rw == READ)
+ if (rw == OBD_BRW_READ)
POISON_PAGE(iobuf->maplist[i], 0x0d);
}
ll_inode_fill_obdo(inode, rw, &oa);
- if (rw == WRITE)
+ if (rw == OBD_BRW_WRITE)
lprocfs_counter_add(ll_i2sbi(inode)->ll_stats,
LPROC_LL_DIRECT_WRITE, iobuf->length);
else
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,
- set, NULL);
- if (rc) {
- CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,
- "error from obd_brw_async: rc = %d\n", rc);
- } else {
- rc = ptlrpc_set_wait(set);
- if (rc)
- 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;
- }
+ rc = obd_brw_rqset(rw, ll_i2obdexp(inode), &oa, lsm, iobuf->nr_pages,
+ pga, NULL);
if (rc == 0) {
rc = iobuf->length;
- obdo_to_inode(inode, &oa, OBD_MD_FLBLOCKS);
+ if (rw == OBD_BRW_WRITE) {
+ lov_stripe_lock(lsm);
+ obd_adjust_kms(ll_i2obdexp(inode), lsm, offset, 0);
+ lov_stripe_unlock(lsm);
+ }
}
OBD_FREE(pga, sizeof(*pga) * iobuf->nr_pages);
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,
- .writepage = ll_writepage_24,
+ .writepage = ll_writepage,
.prepare_write = ll_prepare_write,
.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
};
+
+int ll_sync_page_range(struct inode *inode, struct address_space *mapping,
+ loff_t start, size_t count)
+{
+ return 0;
+}
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff