Re: nfsd-fh: found a name that I didn't expect

[Bernd Schubert <bernd-schubert@web.de>]

On Wednesday 06 August 2003 23:00, John Dalbec wrote:
> Oleg Drokin wrote:
> > Hello!
> >
> > On Sun, Mar 30, 2003 at 04:08:11PM +0100, Bernd Schubert wrote:
> >>Anyway I also tested the kernel-patch, but it causes problems with mounts
> >> from another nfs-server. Well, mounting works fine, but e.g. running 'ls
> >
> > Ah, stupid me.
> > I have another patch that we created before iget5_locked backport.
> > It's a bit of hack to beat the race, but it works (fixes the race).
> > It does not touch any code outside of reiserfs.
> > So if you apply that to 2.4.20 and see if you still can see the NFS
> > problem over time...
> > Patch is below.
>
> I just got an "nfsd-fh: found a name that I didn't expect" yesterday.
> I'm using a Red Hat 2.4.20 RPM with 2.4.20-pending+data-logging+quota.
> Should I apply just this patch or both this patch and the
> iget5_locked_2.4.20 patch?
> Thanks,
> John Dalbec

Hi,

only the patch below! 
Don't install the iget5_locked_2.4.20 patch as it may cause problems with 
imports from other nfs-servers.

Bernd

>
> > Bye,
> >     Oleg
> >
> > ===== fs/reiserfs/inode.c 1.42 vs edited =====
> > --- 1.42/fs/reiserfs/inode.c	Thu Feb 13 15:42:42 2003
> > +++ edited/fs/reiserfs/inode.c	Thu Feb 20 17:23:24 2003
> > @@ -20,6 +20,10 @@
> >  static int reiserfs_get_block (struct inode * inode, long block,
> >  			       struct buffer_head * bh_result, int create);
> >
> > +/* This spinlock guards inode pkey in private part of inode
> > +   against race between find_actor() vs reiserfs_read_inode2 */
> > +static spinlock_t keycopy_lock = SPIN_LOCK_UNLOCKED;
> > +
> >  void reiserfs_delete_inode (struct inode * inode)
> >  {
> >      int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2;
> > @@ -898,8 +902,9 @@
> >      bh = PATH_PLAST_BUFFER (path);
> >      ih = PATH_PITEM_HEAD (path);
> >
> > -
> > +    spin_lock(&keycopy_lock);
> >      copy_key (INODE_PKEY (inode), &(ih->ih_key));
> > +    spin_unlock(&keycopy_lock);
> >      inode->i_blksize = PAGE_SIZE;
> >
> >      INIT_LIST_HEAD(&inode->u.reiserfs_i.i_prealloc_list) ;
> > @@ -1220,10 +1225,27 @@
> >  				unsigned long inode_no, void *opaque )
> >  {
> >      struct reiserfs_iget4_args *args;
> > +    int retval;
> >
> >      args = opaque;
> > +    /* We protect against possible parallel init_inode() on another CPU
> > here. */ +    spin_lock(&keycopy_lock);
> >      /* args is already in CPU order */
> > -    return le32_to_cpu(INODE_PKEY(inode)->k_dir_id) == args -> objectid;
> > +    if (le32_to_cpu(INODE_PKEY(inode)->k_dir_id) == args -> objectid)
> > +	retval = 1;
> > +    else
> > +	/* If The key does not match, lets see if we are racing
> > +	   with another iget4, that already progressed so far
> > +	   to reiserfs_read_inode2() and was preempted in
> > +	   call to search_by_key(). The signs of that are:
> > +	     Inode is locked
> > +	     dirid and object id are zero (not yet initialized)*/
> > +	retval = (inode->i_state & I_LOCK) &&
> > +		 !INODE_PKEY(inode)->k_dir_id &&
> > +		 !INODE_PKEY(inode)->k_objectid;
> > +
> > +    spin_unlock(&keycopy_lock);
> > +    return retval;
> >  }
> >
> >  struct inode * reiserfs_iget (struct super_block * s, const struct
> > cpu_key * key)