[SSI] openssi/kernel/cluster/ssi/cfs vfs.c,1.5.2.6,1.5.2.7

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32673/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-RH
        vfs.c 
Log Message:
BUG FIX: NFS server handling readdirplus deadlocks
        In cfsd_lookup() don't try to lock i_sem again if already owned


Index: vfs.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/Attic/vfs.c,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -d -r1.5.2.6 -r1.5.2.7
--- vfs.c       7 Jun 2004 23:57:36 -0000       1.5.2.6
+++ vfs.c       30 Jun 2004 21:54:30 -0000      1.5.2.7
@@ -137,6 +137,7 @@
        struct dentry           *dentry;
        int                     err;
        kdev_t                  dev;
+       int locked = FALSE;
 
        dprintk("cfsd: cfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(&dhp->sct_fh),
                        (int)name->len, name->name);
@@ -144,7 +145,11 @@
        *hpp = NULL;
 
        /* Lookup the name, but don't follow links */
-       down(&(dparent->d_inode->i_sem));
+       /* In NFS server handling readdirplus we can already own this lock */
+       if (!sem_owned(&(dparent->d_inode->i_sem))) {
+               down(&(dparent->d_inode->i_sem));
+               locked = TRUE;
+       }
        dentry = lookup_hash(name, dparent);
        err = PTR_ERR(dentry);
        if (IS_ERR(dentry)) {
@@ -173,7 +178,8 @@
 out:
        if (!IS_ERR(dentry))
                dput(dentry);
-       up(&(dparent->d_inode->i_sem));
+       if (locked)
+               up(&(dparent->d_inode->i_sem));
 
        return err;
 }



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com