X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fsymlink.c;h=4b1a9daf50b8dac36433ded65bef08d099c90036;hb=ab8b977f77e44c3f4d57be2244e9df898fd15316;hp=9a59011dc2cf0cc13b46d16de8d54bc03f4cf6de;hpb=99aec0dc17de5f980588c08d8befd0f3119db0ea;p=fs%2Flustre-release.git diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c index 9a59011..4b1a9da 100644 --- a/lustre/llite/symlink.c +++ b/lustre/llite/symlink.c @@ -27,7 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,11 +37,9 @@ #include #include #include -#include #include #define DEBUG_SUBSYSTEM S_LLITE -#include #include "llite_internal.h" static int ll_readlink_internal(struct inode *inode, @@ -79,21 +77,25 @@ static int ll_readlink_internal(struct inode *inode, ll_finish_md_op_data(op_data); if (rc) { if (rc != -ENOENT) - CERROR("inode %lu: rc = %d\n", inode->i_ino, rc); + CERROR("%s: inode "DFID": rc = %d\n", + ll_get_fsname(inode->i_sb, NULL, 0), + PFID(ll_inode2fid(inode)), rc); GOTO (failed, rc); } body = req_capsule_server_get(&(*request)->rq_pill, &RMF_MDT_BODY); LASSERT(body != NULL); - if ((body->valid & OBD_MD_LINKNAME) == 0) { - CERROR("OBD_MD_LINKNAME not set on reply\n"); - GOTO(failed, rc = -EPROTO); - } + if ((body->mbo_valid & OBD_MD_LINKNAME) == 0) { + CERROR("OBD_MD_LINKNAME not set on reply\n"); + GOTO(failed, rc = -EPROTO); + } - LASSERT(symlen != 0); - if (body->eadatasize != symlen) { - CERROR("inode %lu: symlink length %d not expected %d\n", - inode->i_ino, body->eadatasize - 1, symlen - 1); + LASSERT(symlen != 0); + if (body->mbo_eadatasize != symlen) { + CERROR("%s: inode "DFID": symlink length %d not expected %d\n", + ll_get_fsname(inode->i_sb, NULL, 0), + PFID(ll_inode2fid(inode)), body->mbo_eadatasize - 1, + symlen - 1); GOTO(failed, rc = -EPROTO); } @@ -101,8 +103,9 @@ static int ll_readlink_internal(struct inode *inode, if (*symname == NULL || strnlen(*symname, symlen) != symlen - 1) { /* not full/NULL terminated */ - CERROR("inode %lu: symlink not NULL terminated string" - "of length %d\n", inode->i_ino, symlen - 1); + CERROR("%s: inode "DFID": symlink not NULL terminated string" + "of length %d\n", ll_get_fsname(inode->i_sb, NULL, 0), + PFID(ll_inode2fid(inode)), symlen - 1); GOTO(failed, rc = -EPROTO); } @@ -118,42 +121,14 @@ failed: RETURN (rc); } -static int ll_readlink(struct dentry *dentry, char *buffer, int buflen) -{ - struct inode *inode = dentry->d_inode; - struct ptlrpc_request *request; - char *symname; - int rc; - ENTRY; - - CDEBUG(D_VFSTRACE, "VFS Op\n"); - - ll_inode_size_lock(inode, 0); - rc = ll_readlink_internal(inode, &request, &symname); - if (rc) - GOTO(out, rc); - - rc = vfs_readlink(dentry, buffer, buflen, symname); - out: - ptlrpc_req_finished(request); - ll_inode_size_unlock(inode, 0); - RETURN(rc); -} - -#ifdef HAVE_COOKIE_FOLLOW_LINK -# define LL_FOLLOW_LINK_RETURN_TYPE void * -#else -# define LL_FOLLOW_LINK_RETURN_TYPE int -#endif - -static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry, - struct nameidata *nd) +#ifdef HAVE_SYMLINK_OPS_USE_NAMEIDATA +static void *ll_follow_link(struct dentry *dentry, struct nameidata *nd) { - struct inode *inode = dentry->d_inode; - struct ptlrpc_request *request = NULL; - int rc; - char *symname; - ENTRY; + struct inode *inode = dentry->d_inode; + struct ptlrpc_request *request = NULL; + int rc; + char *symname = NULL; + ENTRY; CDEBUG(D_VFSTRACE, "VFS Op\n"); /* Limit the recursive symlink depth to 5 instead of default @@ -164,58 +139,66 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_follow_link(struct dentry *dentry, } else if (THREAD_SIZE == 8192 && current->link_count >= 8) { rc = -ELOOP; } else { - ll_inode_size_lock(inode, 0); - rc = ll_readlink_internal(inode, &request, &symname); - ll_inode_size_unlock(inode, 0); - } - if (rc) { - cfs_path_put(nd); /* Kernel assumes that ->follow_link() - releases nameidata on error */ - GOTO(out, rc); + ll_inode_size_lock(inode); + rc = ll_readlink_internal(inode, &request, &symname); + ll_inode_size_unlock(inode); } + if (rc) { + ptlrpc_req_finished(request); + request = NULL; + symname = ERR_PTR(rc); + } -#ifdef HAVE_COOKIE_FOLLOW_LINK - nd_set_link(nd, symname); - /* @symname may contain a pointer to the request message buffer, - we delay request releasing until ll_put_link then. */ - RETURN(request); -#else - if (lli->lli_symlink_name == NULL) { - /* falling back to recursive follow link if the request - * needs to be cleaned up still. */ - rc = vfs_follow_link(nd, symname); - GOTO(out, rc); - } - nd_set_link(nd, symname); - RETURN(0); -#endif -out: - ptlrpc_req_finished(request); -#ifdef HAVE_COOKIE_FOLLOW_LINK - RETURN(ERR_PTR(rc)); + nd_set_link(nd, symname); + /* symname may contain a pointer to the request message buffer, + * we delay request releasing until ll_put_link then. + */ + RETURN(request); +} #else - RETURN(rc); -#endif +static const char *ll_follow_link(struct dentry *dentry, void **cookie) +{ + struct inode *inode = d_inode(dentry); + struct ptlrpc_request *request; + char *symname; + int rc; + ENTRY; + + CDEBUG(D_VFSTRACE, "VFS Op\n"); + ll_inode_size_lock(inode); + rc = ll_readlink_internal(inode, &request, &symname); + ll_inode_size_unlock(inode); + if (rc < 0) { + ptlrpc_req_finished(request); + return ERR_PTR(rc); + } + + /* symname may contain a pointer to the request message buffer, + * we delay request releasing until ll_put_link then. + */ + *cookie = request; + RETURN(symname); } +#endif /* HAVE_SYMLINK_OPS_USE_NAMEIDATA */ -#ifdef HAVE_COOKIE_FOLLOW_LINK +#ifdef HAVE_SYMLINK_OPS_USE_NAMEIDATA static void ll_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) +#else +static void ll_put_link(struct inode *unused, void *cookie) +#endif { - ptlrpc_req_finished(cookie); + ptlrpc_req_finished(cookie); } -#endif struct inode_operations ll_fast_symlink_inode_operations = { - .readlink = ll_readlink, - .setattr = ll_setattr, - .follow_link = ll_follow_link, -#ifdef HAVE_COOKIE_FOLLOW_LINK - .put_link = ll_put_link, -#endif - .getattr = ll_getattr, - .permission = ll_inode_permission, - .setxattr = ll_setxattr, - .getxattr = ll_getxattr, - .listxattr = ll_listxattr, - .removexattr = ll_removexattr, + .readlink = generic_readlink, + .setattr = ll_setattr, + .follow_link = ll_follow_link, + .put_link = ll_put_link, + .getattr = ll_getattr, + .permission = ll_inode_permission, + .setxattr = ll_setxattr, + .getxattr = ll_getxattr, + .listxattr = ll_listxattr, + .removexattr = ll_removexattr, };