From 9a53521c1817b8e373d904f75d7d71e9b130391c Mon Sep 17 00:00:00 2001 From: shorthair Date: Sun, 12 Jan 2003 10:43:28 +0000 Subject: [PATCH] This branch b_lum25 replace b_lin25 using the latest Lustre tree ptlbd can't be compiled with kernel 2.5 now, so changed Makefile temporary Now this branch can mount/umount and do some basic fs syscall --- lustre/llite/symlink.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c index 5be4717..ad9e5d7 100644 --- a/lustre/llite/symlink.c +++ b/lustre/llite/symlink.c @@ -83,8 +83,7 @@ static int ll_readlink(struct dentry *dentry, char *buffer, int buflen) RETURN(rc); } -static int ll_follow_link(struct dentry *dentry, struct nameidata *nd, - struct lookup_intent *it) +static int ll_follow_link(struct dentry *dentry, struct nameidata *nd) { struct inode *inode = dentry->d_inode; struct ll_inode_info *lli = ll_i2info(inode); @@ -93,12 +92,10 @@ static int ll_follow_link(struct dentry *dentry, struct nameidata *nd, char *symname; ENTRY; - if (it != NULL) { - op = it->it_op; - mode = it->it_mode; + op = nd->it.it_op; + mode = nd->it.it_mode; - ll_intent_release(dentry, it); - } + ll_intent_release(dentry, &nd->it); down(&lli->lli_open_sem); @@ -106,12 +103,10 @@ static int ll_follow_link(struct dentry *dentry, struct nameidata *nd, if (rc) GOTO(out, rc); - if (it != NULL) { - it->it_op = op; - it->it_mode = mode; - } + nd->it.it_op = op; + nd->it.it_mode = mode; - rc = vfs_follow_link_it(nd, symname, it); + rc = vfs_follow_link(nd, symname); out: up(&lli->lli_open_sem); ptlrpc_req_finished(request); -- 1.8.3.1