[TCP]: Cleanup tcp_tso_acked and tcp_clean_rtx_queue

[linux-2.6-omap-h63xx.git] / fs / nfs / idmap.c

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 82ad7110a1c0b75458ff84aeffdeb2c4423251ad..d11eb055265cbd80dbb5f280d0f9d118c8fe64d5 100644 (file)
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -272,7 +272,7 @@ nfs_idmap_id(struct idmap *idmap, struct idmap_hashtable *h,
        set_current_state(TASK_UNINTERRUPTIBLE);
        mutex_unlock(&idmap->idmap_im_lock);
        schedule();
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
        remove_wait_queue(&idmap->idmap_wq, &wq);
        mutex_lock(&idmap->idmap_im_lock);
 
@@ -333,7 +333,7 @@ nfs_idmap_name(struct idmap *idmap, struct idmap_hashtable *h,
        set_current_state(TASK_UNINTERRUPTIBLE);
        mutex_unlock(&idmap->idmap_im_lock);
        schedule();
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
        remove_wait_queue(&idmap->idmap_wq, &wq);
        mutex_lock(&idmap->idmap_im_lock);
 
@@ -377,7 +377,7 @@ idmap_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
 static ssize_t
 idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
 {
-        struct rpc_inode *rpci = RPC_I(filp->f_dentry->d_inode);
+        struct rpc_inode *rpci = RPC_I(filp->f_path.dentry->d_inode);
        struct idmap *idmap = (struct idmap *)rpci->private;
        struct idmap_msg im_in, *im = &idmap->idmap_im;
        struct idmap_hashtable *h;