From c4f07eb3e9adfd826a8b8652ccc95802ace56315 Mon Sep 17 00:00:00 2001 From: Carsten Otte Date: Wed, 19 Apr 2006 13:06:37 -0400 Subject: [PATCH] --- yaml --- r: 26029 b: refs/heads/master c: 7451c4f0ee53e36fd74168af8df75b28fd04a2aa h: refs/heads/master i: 26027: ffd72d93c9362d0fe073f0efcecf83c9034dcebe v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a97c516fe926..68ed12989e80 100644 --- 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 index a23f34894167..cae74dd4c7f5 100644 --- 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; }