[SSI] openssi/kernel/cluster/ssi/cfs vfs.c,1.36,1.37

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25509/kernel/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	vfs.c 
Log Message:
cfsd_lookup: assign value to variable "locked" once. reduce unnecessary work.


Index: vfs.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/vfs.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- vfs.c	25 Oct 2010 05:56:23 -0000	1.36
+++ vfs.c	15 Dec 2010 08:05:26 -0000	1.37
@@ -140,9 +140,8 @@
 {
 	struct dentry		*dparent = dhp->sct_dp;
 	struct dentry		*dentry;
-	int			err;
 	dev_t			dev;
-	int locked = FALSE;
+	int			err, lock;
 
 	dprintk("cfsd: cfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(&dhp->sct_fh),
 		       	(int)name->len, name->name);
@@ -151,10 +150,9 @@
 
 	/* Lookup the name, but don't follow links */
 	/* 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;
-	}
+	lock = !sem_owned(&dparent->d_inode->i_sem);
+	if (lock)
+		down(&dparent->d_inode->i_sem);
 
 	dentry = lookup_hash(name, dparent);
 	if (IS_ERR(dentry)) {
@@ -184,8 +182,8 @@
 out:
 	if (dentry)
 		dput(dentry);
-	if (locked)
-		up(&(dparent->d_inode->i_sem));
+	if (lock)
+		up(&dparent->d_inode->i_sem);
 
 	return err;
 }


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d