summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChuck Lever <cel@netapp.com>2005-12-01 00:08:19 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 20:58:48 +0100
commit6b59a75460eb9527145d7bd55068e5d32bee8a44 (patch)
treee813365a2bdc3605fbc6580d05189b8878185ef6 /fs/nfs
parentNFS: use generic_write_checks() to sanity check direct writes (diff)
downloadlinux-6b59a75460eb9527145d7bd55068e5d32bee8a44.tar.xz
linux-6b59a75460eb9527145d7bd55068e5d32bee8a44.zip
NFS: Fix error recovery code in fs/nfs/inode.c:__init_nfs()
Red Hat found a problem in the error recovery logic in __init_nfs. Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 740d3cd40246..da58207b366b 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -2152,11 +2152,11 @@ out:
#ifdef CONFIG_PROC_FS
rpc_proc_unregister("nfs");
#endif
- nfs_destroy_writepagecache();
#ifdef CONFIG_NFS_DIRECTIO
-out0:
nfs_destroy_directcache();
+out0:
#endif
+ nfs_destroy_writepagecache();
out1:
nfs_destroy_readpagecache();
out2: