#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <sys/queue.h>
#include <sysio.h>
+#ifdef HAVE_XTIO_H
+#include <xtio.h>
+#endif
#include <fs.h>
#include <mount.h>
#include <inode.h>
+#ifdef HAVE_FILE_H
#include <file.h>
+#endif
#undef LIST_HEAD
-#include <linux/types.h>
+#ifdef HAVE_ASM_TYPES_H
+#include <asm/types.h>
+#elif defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_LINUX_UNISTD_H
#include <linux/unistd.h>
+#elif defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
#include <dirent.h>
#include "llite_lib.h"
static int llu_dir_do_readpage(struct inode *inode, struct page *page)
{
struct llu_inode_info *lli = llu_i2info(inode);
+ struct intnl_stat *st = llu_i2stat(inode);
struct llu_sb_info *sbi = llu_i2sbi(inode);
- struct lustre_id id;
__u64 offset;
int rc = 0;
struct ptlrpc_request *request;
struct lustre_handle lockh;
- struct mds_body *body;
+ struct mdt_body *body;
struct lookup_intent it = { .it_op = IT_READDIR };
- struct mdc_op_data data;
- struct obd_device *obddev = class_exp2obd(sbi->ll_lmv_exp);
- struct ldlm_res_id res_id =
- { .name = {id_fid(&lli->lli_id), id_group(&lli->lli_id)} };
+ struct md_op_data op_data;
ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
ENTRY;
- rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
- &res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
+ rc = md_lock_match(sbi->ll_md_exp, LDLM_FL_BLOCK_GRANTED,
+ &lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh);
if (!rc) {
- llu_prepare_mdc_data(&data, inode, NULL, NULL, 0, 0);
+ struct ldlm_enqueue_info einfo = {LDLM_IBITS, LCK_CR,
+ llu_md_blocking_ast, ldlm_completion_ast, NULL, inode};
+
+ llu_prep_md_op_data(&op_data, inode, NULL, NULL, 0, 0,
+ LUSTRE_OPC_ANY);
- rc = mdc_enqueue(sbi->ll_lmv_exp, LDLM_IBITS, &it, LCK_PR,
- &data, &lockh, NULL, 0,
- ldlm_completion_ast, llu_mdc_blocking_ast,
- inode);
+ rc = md_enqueue(sbi->ll_md_exp, &einfo, &it,
+ &op_data, &lockh, NULL, 0,
+ LDLM_FL_CANCEL_ON_BLOCK);
request = (struct ptlrpc_request *)it.d.lustre.it_data;
if (request)
ptlrpc_req_finished(request);
}
ldlm_lock_dump_handle(D_OTHER, &lockh);
- /* FIXME-UMKA: should be here some mds num and mds id? */
- mdc_pack_id(&id, lli->lli_st_ino, lli->lli_st_generation,
- S_IFDIR, 0, 0);
-
- offset = page->index << PAGE_SHIFT;
- rc = mdc_readpage(sbi->ll_lmv_exp, &id, offset, page, &request);
+ offset = (__u64)page->index << CFS_PAGE_SHIFT;
+ rc = md_readpage(sbi->ll_md_exp, &lli->lli_fid, NULL,
+ offset, page, &request);
if (!rc) {
- body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
- LASSERT (body != NULL); /* checked by mdc_readpage() */
- LASSERT_REPSWABBED (request, 0); /* swabbed by mdc_readpage() */
+ body = lustre_msg_buf(request->rq_repmsg, REPLY_REC_OFF,
+ sizeof(*body));
+ LASSERT(body != NULL); /* checked by md_readpage() */
+ /* swabbed by md_readpage() */
+ LASSERT(lustre_rep_swabbed(request, REPLY_REC_OFF));
- lli->lli_st_size = body->size;
+ st->st_size = body->size;
} else {
CERROR("read_dir_page(%ld) error %d\n", page->index, rc);
}
ptlrpc_req_finished(request);
EXIT;
- ldlm_lock_decref(&lockh, LCK_PR);
+ ldlm_lock_decref(&lockh, LCK_CR);
return rc;
}
-static struct page *llu_dir_read_page(struct inode *ino, int pgidx)
+static struct page *llu_dir_read_page(struct inode *ino, unsigned long pgidx)
{
struct page *page;
int rc;
ENTRY;
- page = alloc_page(0);
+ page = cfs_alloc_page(0);
if (!page) {
CERROR("alloc page failed\n");
RETURN(ERR_PTR(-ENOMEM));
return 1;
dirent->d_ino = ino;
- dirent->d_off = offset,
+ dirent->d_off = offset;
dirent->d_reclen = reclen;
+#ifndef _AIX
dirent->d_type = (unsigned short) d_type;
+#endif
memcpy(dirent->d_name, name, namelen);
dirent->d_name[namelen] = 0;
return 0;
}
-ssize_t llu_iop_getdirentries(struct inode *ino, char *buf, size_t nbytes,
- _SYSIO_OFF_T *basep)
+ssize_t llu_iop_filldirentries(struct inode *ino, _SYSIO_OFF_T *basep,
+ char *buf, size_t nbytes)
{
struct llu_inode_info *lli = llu_i2info(ino);
+ struct intnl_stat *st = llu_i2stat(ino);
loff_t pos = *basep, offset;
- int maxpages, pgidx, filled = 0;
+ unsigned long maxpages, pgidx;
+ int filled = 0;
ENTRY;
- if (lli->lli_st_size == 0) {
+ liblustre_wait_event(0);
+
+ if (st->st_size == 0) {
CWARN("dir size is 0?\n");
RETURN(0);
}
- liblustre_wait_event(0);
-
if (pos == -1)
pos = lli->lli_dir_pos;
- maxpages = (lli->lli_st_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
- pgidx = pos >> PAGE_SHIFT;
- offset = pos & ~PAGE_MASK;
+ maxpages = (st->st_size + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT;
+ pgidx = pos >> CFS_PAGE_SHIFT;
+ offset = pos & ~CFS_PAGE_MASK;
for ( ; pgidx < maxpages ; pgidx++, offset = 0) {
struct page *page;
if (IS_ERR(page))
continue;
- /* size might have been updated by mdc_readpage */
- maxpages = (lli->lli_st_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ /* size might have been updated by md_readpage */
+ maxpages = (st->st_size + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT;
/* fill in buffer */
addr = page->addr;
- limit = addr + PAGE_SIZE - EXT2_DIR_REC_LEN(1);
+ limit = addr + CFS_PAGE_SIZE - EXT2_DIR_REC_LEN(1);
de = (struct ext2_dirent *) (addr + offset);
for ( ; (char*) de <= limit; de = ext2_next_entry(de)) {
offset = (char*) de - addr;
over = filldir(buf, nbytes, de->name, de->name_len,
- (pgidx << PAGE_SHIFT) | offset,
+ (((__u64)pgidx << PAGE_SHIFT) | offset) +
+ le16_to_cpu(de->rec_len),
le32_to_cpu(de->inode), d_type, &filled);
if (over) {
free_page(page);
+ /*
+ * if buffer overflow with no data
+ * returned yet, then report error
+ * instead of eof
+ */
+ if (filled == 0)
+ RETURN(-EINVAL);
GOTO(done, 0);
}
}
free_page(page);
}
done:
- lli->lli_dir_pos = pgidx << PAGE_SHIFT | offset;
+ lli->lli_dir_pos = pgidx << CFS_PAGE_SHIFT | offset;
*basep = lli->lli_dir_pos;
+ liblustre_wait_event(0);
RETURN(filled);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff