X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fliblustre%2Fdir.c;h=fb33c355357155d378daf69eceebd8b45740a423;hb=9ca726ac69b07c7fdc8d134df303c3360f7feb02;hp=16b75b680ba4b81fa5957b8c620ba761de7296ee;hpb=e08fb10148bfab6b4606f701733decf30aef8a44;p=fs%2Flustre-release.git diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c index 16b75b6..fb33c35 100644 --- a/lustre/liblustre/dir.c +++ b/lustre/liblustre/dir.c @@ -1,24 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Lustre Light directory handling + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright (c) 2002-2004 Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * This file is part of Lustre, http://www.lustre.org. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * GPL HEADER END + */ +/* + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/liblustre/dir.c + * + * Lustre Light directory handling */ #define DEBUG_SUBSYSTEM S_LLITE @@ -33,34 +50,15 @@ #include #include -#include -#ifdef HAVE_XTIO_H -#include -#endif -#include -#include -#include -#ifdef HAVE_FILE_H -#include -#endif - -#undef LIST_HEAD - -#ifdef HAVE_ASM_TYPES_H -#include -#elif defined(HAVE_SYS_TYPES_H) -#include -#endif - #ifdef HAVE_LINUX_UNISTD_H #include #elif defined(HAVE_UNISTD_H) #include #endif -#include #include "llite_lib.h" +#include /* (new) readdir implementation overview can be found in lustre/llite/dir.c */ @@ -83,13 +81,14 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page) &lli->lli_fid, LDLM_IBITS, &policy, LCK_CR, &lockh); if (!rc) { struct ldlm_enqueue_info einfo = {LDLM_IBITS, LCK_CR, - llu_md_blocking_ast, ldlm_completion_ast, NULL, inode}; + llu_md_blocking_ast, ldlm_completion_ast, NULL, NULL, + inode}; llu_prep_md_op_data(&op_data, inode, NULL, NULL, 0, 0, LUSTRE_OPC_ANY); rc = md_enqueue(sbi->ll_md_exp, &einfo, &it, - &op_data, &lockh, NULL, 0, + &op_data, &lockh, NULL, 0, NULL, LDLM_FL_CANCEL_ON_BLOCK); request = (struct ptlrpc_request *)it.d.lustre.it_data; if (request) @@ -120,10 +119,10 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page) return rc; } -static struct page *llu_dir_read_page(struct inode *ino, __u32 hash, - int exact, struct ll_dir_chain *chain) +static cfs_page_t *llu_dir_read_page(struct inode *ino, __u64 hash, + int exact, struct ll_dir_chain *chain) { - struct page *page; + cfs_page_t *page; int rc; ENTRY; @@ -141,31 +140,7 @@ static struct page *llu_dir_read_page(struct inode *ino, __u32 hash, return page; } -enum { - EXT2_FT_UNKNOWN, - EXT2_FT_REG_FILE, - EXT2_FT_DIR, - EXT2_FT_CHRDEV, - EXT2_FT_BLKDEV, - EXT2_FT_FIFO, - EXT2_FT_SOCK, - EXT2_FT_SYMLINK, - EXT2_FT_MAX -}; - -static unsigned char ext2_filetype_table[EXT2_FT_MAX] = { - [EXT2_FT_UNKNOWN] DT_UNKNOWN, - [EXT2_FT_REG_FILE] DT_REG, - [EXT2_FT_DIR] DT_DIR, - [EXT2_FT_CHRDEV] DT_CHR, - [EXT2_FT_BLKDEV] DT_BLK, - [EXT2_FT_FIFO] DT_FIFO, - [EXT2_FT_SOCK] DT_SOCK, - [EXT2_FT_SYMLINK] DT_LNK, -}; - - -void (*memmover)(void *, const void *, size_t) = memmove; +void *(*memmover)(void *, const void *, size_t) = memmove; #define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de))) #define ROUND_UP64(x) (((x)+sizeof(__u64)-1) & ~(sizeof(__u64)-1)) @@ -206,23 +181,24 @@ static int filldir(char *buf, int buflen, return 0; } -/* +/* * TODO: much of the code here is similar/identical to llite ll_readdir(). * These code can be factored out and shared in a common module. */ -ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, +ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, char *buf, size_t nbytes) { struct llu_inode_info *lli = llu_i2info(dir); struct intnl_stat *st = llu_i2stat(dir); loff_t pos = *basep; struct ll_dir_chain chain; - struct page *page; + cfs_page_t *page; int filled = 0; int rc; int done; int shift; + __u16 type; ENTRY; liblustre_wait_event(0); @@ -249,9 +225,9 @@ ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, struct lu_dirent *ent; if (!IS_ERR(page)) { - /* + /* * If page is empty (end of directoryis reached), - * use this value. + * use this value. */ __u64 hash = DIR_END_OFF; __u64 next; @@ -262,7 +238,7 @@ ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, char *name; int namelen; struct lu_fid fid; - ino_t ino; + __u64 ino; hash = le64_to_cpu(ent->lde_hash); namelen = le16_to_cpu(ent->lde_namelen); @@ -283,10 +259,10 @@ ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, fid = ent->lde_fid; name = ent->lde_name; fid_le_to_cpu(&fid, &fid); - ino = llu_fid_build_ino(llu_i2sbi(dir), &fid); - + ino = cl_fid_build_ino(&fid); + type = ll_dirent_type_get(ent); done = filldir(buf, nbytes, name, namelen, - (loff_t)hash, ino, DT_UNKNOWN, + (loff_t)hash, ino, type, &filled); } next = le64_to_cpu(dp->ldp_hash_end); @@ -321,7 +297,7 @@ ssize_t llu_iop_filldirentries(struct inode *dir, _SYSIO_OFF_T *basep, PFID(&lli->lli_fid), (unsigned long)pos, rc); } } - lli->lli_dir_pos = (loff_t)(__s32)pos; + lli->lli_dir_pos = (loff_t)pos; *basep = lli->lli_dir_pos; out: ll_dir_chain_fini(&chain);