Fix _fat_bmap() locking

[safe/jmp/linux-2.6] / fs / nfs / namespace.c

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 66df08d..64a288e 100644 (file)
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -105,7 +105,10 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
 
        dprintk("--> nfs_follow_mountpoint()\n");
 
-       BUG_ON(IS_ROOT(dentry));
+       err = -ESTALE;
+       if (IS_ROOT(dentry))
+               goto out_err;
+
        dprintk("%s: enter\n", __func__);
        dput(nd->path.dentry);
        nd->path.dentry = dget(dentry);
@@ -189,7 +192,7 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
                                           struct nfs_clone_mount *mountdata)
 {
 #ifdef CONFIG_NFS_V4
-       struct vfsmount *mnt = NULL;
+       struct vfsmount *mnt = ERR_PTR(-EINVAL);
        switch (server->nfs_client->rpc_ops->version) {
                case 2:
                case 3: