[305] in arla-drinkers
Re: arla 0.13
daemon@ATHENA.MIT.EDU (Jim Nance)
Mon Oct 5 08:55:10 1998
From owner-arla-drinkers@stacken.kth.se Mon Oct 05 12:55:09 1998
Return-Path: <owner-arla-drinkers@stacken.kth.se>
Delivered-To: arla-drinkers-mtg@bloom-picayune.mit.edu
Received: (qmail 13451 invoked from network); 5 Oct 1998 12:55:08 -0000
Received: from unknown (HELO sundance.stacken.kth.se) (130.237.234.41)
by bloom-picayune.mit.edu with SMTP; 5 Oct 1998 12:55:08 -0000
Received: (from majordom@localhost)
by sundance.stacken.kth.se (8.8.8/8.8.8) id OAA04237
for arla-drinkers-list; Mon, 5 Oct 1998 14:47:51 +0200 (MET DST)
Received: from sailboat.acs.uncwil.edu (sailboat.acs.uncwil.edu [152.20.10.11])
by sundance.stacken.kth.se (8.8.8/8.8.8) with ESMTP id OAA04233
for <arla-drinkers@stacken.kth.se>; Mon, 5 Oct 1998 14:47:45 +0200 (MET DST)
Received: (from jim@localhost)
by sailboat.acs.uncwil.edu (8.8.7/8.8.7) id IAA27815;
Mon, 5 Oct 1998 08:48:21 -0400
Message-ID: <19981005084821.27883@sailboat.acs.uncwil.edu>
Date: Mon, 5 Oct 1998 08:48:21 -0400
From: Jim Nance <jim@sailboat.acs.uncwil.edu>
To: Assar Westerlund <assar@sics.se>
Cc: arla-drinkers@stacken.kth.se
Subject: Re: arla 0.13
References: <5liuhz62jg.fsf@assaris.pdc.kth.se>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.85e
In-Reply-To: <5liuhz62jg.fsf@assaris.pdc.kth.se>; from Assar Westerlund on Mon, Oct 05, 1998 at 06:44:19AM +0200
Sender: owner-arla-drinkers@stacken.kth.se
Precedence: bulk
I made this patch for xfs_follow_link() because a paramater got added
the the linux follow_link function around 2.1.123. I am not really familiar
with the arla code, but this looks like the modification that was made
to the ext2 code, so I am assuming its correct.
Thanks,
Jim
diff -u arla-0.12/xfs/linux/xfs_inodeops.c jimsarla/xfs/linux/xfs_inodeops.c
--- arla-0.12/xfs/linux/xfs_inodeops.c Tue Sep 29 11:38:43 1998
+++ jimsarla/xfs/linux/xfs_inodeops.c Wed Sep 30 16:30:10 1998
@@ -151,7 +151,7 @@
int flag, int mode, struct inode ** res_inode);
#else
static struct dentry *
-xfs_follow_link(struct dentry *, struct dentry *);
+xfs_follow_link(struct dentry *, struct dentry *, unsigned int);
#endif /* LINUX2_1 */
#ifndef LINUX2_1
@@ -1658,6 +1658,7 @@
}
#ifndef LINUX2_1
+#error the Linux define is wrong
static int xfs_follow_link(struct inode * dir, struct inode * inode,
int flag, int mode, struct inode ** res_inode)
{
@@ -1705,7 +1706,7 @@
}
#else
static struct dentry *
-xfs_follow_link(struct dentry *dentry, struct dentry *base)
+xfs_follow_link(struct dentry *dentry, struct dentry *base, unsigned int follow
)
{
char *buffer;
int error;
@@ -1731,7 +1732,7 @@
if (error <= MAXPATHLEN)
buffer[error]='\0';
XFSDEB(XDEBVNOPS, ("xfs_follow_link linkname: %s\n", buffer));
- base = lookup_dentry(buffer, base, 1);
+ base = lookup_dentry(buffer, base, follow);
xfs_free(buffer);
return base;
}
