---

yaml --- r: 26029 b: refs/heads/master c: 7451c4f h: refs/heads/master i: 26027: ffd72d9 v: v3
git-mirror · Apr 19, 2006 · c4f07eb · c4f07eb
1 parent bbb7eed
commit c4f07eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9d9506d944865876e67281a4e4269d823ce5381
+refs/heads/master: 7451c4f0ee53e36fd74168af8df75b28fd04a2aa
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -128,15 +128,14 @@ struct inode_operations nfs4_dir_inode_operations = {
 static int
 nfs_opendir(struct inode *inode, struct file *filp)
 {
-	int res = 0;
+	int res;
 
 	dfprintk(VFS, "NFS: opendir(%s/%ld)\n",
 			inode->i_sb->s_id, inode->i_ino);
 
 	lock_kernel();
 	/* Call generic open code in order to cache credentials */
-	if (!res)
-		res = nfs_open(inode, filp);
+	res = nfs_open(inode, filp);
 	unlock_kernel();
 	return res;
 }