11 files changed, 174 insertions, 142 deletions

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 44135af9894c..618a327027b3 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -31,11 +31,42 @@ static void nfs_free_delegation(struct nfs_delegation *delegation)
         kfree(delegation);
 }
 
+static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_state *state)
+{
+        struct inode *inode = state->inode;
+        struct file_lock *fl;
+        int status;
+
+        for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
+                if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
+                        continue;
+                if ((struct nfs_open_context *)fl->fl_file->private_data != ctx)
+                        continue;
+                status = nfs4_lock_delegation_recall(state, fl);
+                if (status >= 0)
+                        continue;
+                switch (status) {
+                        default:
+                                printk(KERN_ERR "%s: unhandled error %d.\n",
+                                                __FUNCTION__, status);
+                        case -NFS4ERR_EXPIRED:
+                                /* kill_proc(fl->fl_pid, SIGLOST, 1); */
+                        case -NFS4ERR_STALE_CLIENTID:
+                                nfs4_schedule_state_recovery(NFS_SERVER(inode)->nfs4_state);
+                                goto out_err;
+                }
+        }
+        return 0;
+out_err:
+        return status;
+}
+
 static void nfs_delegation_claim_opens(struct inode *inode)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
         struct nfs_open_context *ctx;
         struct nfs4_state *state;
+        int err;
 
 again:
         spin_lock(&inode->i_lock);
@@ -47,9 +78,12 @@ again:
                         continue;
                 get_nfs_open_context(ctx);
                 spin_unlock(&inode->i_lock);
-                if (nfs4_open_delegation_recall(ctx->dentry, state) < 0)
-                        return;
+                err = nfs4_open_delegation_recall(ctx->dentry, state);
+                if (err >= 0)
+                        err = nfs_delegation_claim_locks(ctx, state);
                 put_nfs_open_context(ctx);
+                if (err != 0)
+                        return;
                 goto again;
         }
         spin_unlock(&inode->i_lock);
@@ -115,8 +149,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
                 }
         }
         spin_unlock(&clp->cl_lock);
-        if (delegation != NULL)
-                kfree(delegation);
+        kfree(delegation);
         return status;
 }
 
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index 8017846b561f..2fcc30de924b 100644
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -38,6 +38,7 @@ void nfs_delegation_reap_unclaimed(struct nfs4_client *clp);
 /* NFSv4 delegation-related procedures */
 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid);
 int nfs4_open_delegation_recall(struct dentry *dentry, struct nfs4_state *state);
+int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl);
 
 static inline int nfs_have_delegation(struct inode *inode, int flags)
 {
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 8272ed3fc707..7370583b61e5 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1257,6 +1257,9 @@ dentry->d_parent->d_name.name, dentry->d_name.name);
         sprintf(silly, ".nfs%*.*lx",
                 i_inosize, i_inosize, dentry->d_inode->i_ino);
 
+        /* Return delegation in anticipation of the rename */
+        nfs_inode_return_delegation(dentry->d_inode);
+
         sdentry = NULL;
         do {
                 char *suffix = silly + slen - countersize;
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 6537f2c4ae44..b497c71384e8 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -655,7 +655,6 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
         struct file *file = iocb->ki_filp;
         struct nfs_open_context *ctx =
                         (struct nfs_open_context *) file->private_data;
-        struct dentry *dentry = file->f_dentry;
         struct address_space *mapping = file->f_mapping;
         struct inode *inode = mapping->host;
         struct iovec iov = {
@@ -664,7 +663,8 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
         };
 
         dprintk("nfs: direct read(%s/%s, %lu@%lu)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name,
                 (unsigned long) count, (unsigned long) pos);
 
         if (!is_sync_kiocb(iocb))
@@ -730,7 +730,6 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
         struct file *file = iocb->ki_filp;
         struct nfs_open_context *ctx =
                         (struct nfs_open_context *) file->private_data;
-        struct dentry *dentry = file->f_dentry;
         struct address_space *mapping = file->f_mapping;
         struct inode *inode = mapping->host;
         struct iovec iov = {
@@ -739,8 +738,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
         };
 
         dfprintk(VFS, "nfs: direct write(%s/%s(%ld), %lu@%lu)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
-                inode->i_ino, (unsigned long) count, (unsigned long) pos);
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name, inode->i_ino,
+                (unsigned long) count, (unsigned long) pos);
 
         if (!is_sync_kiocb(iocb))
                 goto out;
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index fc0f12ba89cc..6391d8964214 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1009,13 +1009,18 @@ void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)
         spin_unlock(&inode->i_lock);
 }
 
-struct nfs_open_context *nfs_find_open_context(struct inode *inode, int mode)
+/*
+ * Given an inode, search for an open context with the desired characteristics
+ */
+struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
         struct nfs_open_context *pos, *ctx = NULL;
 
         spin_lock(&inode->i_lock);
         list_for_each_entry(pos, &nfsi->open_files, list) {
+                if (cred != NULL && pos->cred != cred)
+                        continue;
                 if ((pos->mode & mode) == mode) {
                         ctx = get_nfs_open_context(pos);
                         break;
@@ -1683,8 +1688,7 @@ static void nfs_kill_super(struct super_block *s)
 
         rpciod_down();          /* release rpciod */
 
-        if (server->hostname != NULL)
-                kfree(server->hostname);
+        kfree(server->hostname);
         kfree(server);
 }
 
@@ -1903,8 +1907,7 @@ nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)
                         return ERR_PTR(-ENOMEM);
         }
         if (copy_from_user(dst, src->data, maxlen)) {
-                if (p != NULL)
-                        kfree(p);
+                kfree(p);
                 return ERR_PTR(-EFAULT);
         }
         dst[maxlen] = '\0';
@@ -1995,10 +1998,8 @@ static struct super_block *nfs4_get_sb(struct file_system_type *fs_type,
 out_err:
         s = (struct super_block *)p;
 out_free:
-        if (server->mnt_path)
-                kfree(server->mnt_path);
-        if (server->hostname)
-                kfree(server->hostname);
+        kfree(server->mnt_path);
+        kfree(server->hostname);
         kfree(server);
         return s;
 }
@@ -2018,8 +2019,7 @@ static void nfs4_kill_super(struct super_block *sb)
 
         destroy_nfsv4_state(server);
 
-        if (server->hostname != NULL)
-                kfree(server->hostname);
+        kfree(server->hostname);
         kfree(server);
 }
 
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 78a53f5a9f18..b7f262dcb6e3 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -214,7 +214,7 @@ extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short);
 extern int nfs4_proc_setclientid_confirm(struct nfs4_client *);
 extern int nfs4_proc_async_renew(struct nfs4_client *);
 extern int nfs4_proc_renew(struct nfs4_client *);
-extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state, mode_t mode);
+extern int nfs4_do_close(struct inode *inode, struct nfs4_state *state);
 extern struct dentry *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
 extern int nfs4_open_revalidate(struct inode *, struct dentry *, int, struct nameidata *);
 
@@ -247,7 +247,7 @@ extern void nfs4_drop_state_owner(struct nfs4_state_owner *);
 extern struct nfs4_state * nfs4_get_open_state(struct inode *, struct nfs4_state_owner *);
 extern void nfs4_put_open_state(struct nfs4_state *);
 extern void nfs4_close_state(struct nfs4_state *, mode_t);
-extern struct nfs4_state *nfs4_find_state(struct inode *, struct rpc_cred *, mode_t mode);
+extern void nfs4_state_set_mode_locked(struct nfs4_state *, mode_t);
 extern void nfs4_schedule_state_recovery(struct nfs4_client *);
 extern void nfs4_put_lock_state(struct nfs4_lock_state *lsp);
 extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 933e13b383f8..21482b2518f6 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -214,16 +214,15 @@ static void update_open_stateid(struct nfs4_state *state, nfs4_stateid *stateid,
         struct inode *inode = state->inode;
 
         open_flags &= (FMODE_READ|FMODE_WRITE);
-        /* Protect against nfs4_find_state() */
+        /* Protect against nfs4_find_state_byowner() */
         spin_lock(&state->owner->so_lock);
         spin_lock(&inode->i_lock);
-        state->state |= open_flags;
-        /* NB! List reordering - see the reclaim code for why.  */
-        if ((open_flags & FMODE_WRITE) && 0 == state->nwriters++)
-                list_move(&state->open_states, &state->owner->so_states);
+        memcpy(&state->stateid, stateid, sizeof(state->stateid));
+        if ((open_flags & FMODE_WRITE))
+                state->nwriters++;
         if (open_flags & FMODE_READ)
                 state->nreaders++;
-        memcpy(&state->stateid, stateid, sizeof(state->stateid));
+        nfs4_state_set_mode_locked(state, state->state | open_flags);
         spin_unlock(&inode->i_lock);
         spin_unlock(&state->owner->so_lock);
 }
@@ -896,7 +895,6 @@ static void nfs4_close_done(struct rpc_task *task)
                         break;
                 case -NFS4ERR_STALE_STATEID:
                 case -NFS4ERR_EXPIRED:
-                        state->state = calldata->arg.open_flags;
                         nfs4_schedule_state_recovery(server->nfs4_state);
                         break;
                 default:
@@ -906,7 +904,6 @@ static void nfs4_close_done(struct rpc_task *task)
                         }
         }
         nfs_refresh_inode(calldata->inode, calldata->res.fattr);
-        state->state = calldata->arg.open_flags;
         nfs4_free_closedata(calldata);
 }
 
@@ -920,24 +917,26 @@ static void nfs4_close_begin(struct rpc_task *task)
                 .rpc_resp = &calldata->res,
                 .rpc_cred = state->owner->so_cred,
         };
-        int mode = 0;
+        int mode = 0, old_mode;
         int status;
 
         status = nfs_wait_on_sequence(calldata->arg.seqid, task);
         if (status != 0)
                 return;
-        /* Don't reorder reads */
-        smp_rmb();
         /* Recalculate the new open mode in case someone reopened the file
          * while we were waiting in line to be scheduled.
          */
-        if (state->nreaders != 0)
-                mode |= FMODE_READ;
-        if (state->nwriters != 0)
-                mode |= FMODE_WRITE;
-        if (test_bit(NFS_DELEGATED_STATE, &state->flags))
-                state->state = mode;
-        if (mode == state->state) {
+        spin_lock(&state->owner->so_lock);
+        spin_lock(&calldata->inode->i_lock);
+        mode = old_mode = state->state;
+        if (state->nreaders == 0)
+                mode &= ~FMODE_READ;
+        if (state->nwriters == 0)
+                mode &= ~FMODE_WRITE;
+        nfs4_state_set_mode_locked(state, mode);
+        spin_unlock(&calldata->inode->i_lock);
+        spin_unlock(&state->owner->so_lock);
+        if (mode == old_mode || test_bit(NFS_DELEGATED_STATE, &state->flags)) {
                 nfs4_free_closedata(calldata);
                 task->tk_exit = NULL;
                 rpc_exit(task, 0);
@@ -961,7 +960,7 @@ static void nfs4_close_begin(struct rpc_task *task)
  *
  * NOTE: Caller must be holding the sp->so_owner semaphore!
  */
-int nfs4_do_close(struct inode *inode, struct nfs4_state *state, mode_t mode) 
+int nfs4_do_close(struct inode *inode, struct nfs4_state *state) 
 {
         struct nfs_server *server = NFS_SERVER(inode);
         struct nfs4_closedata *calldata;
@@ -1275,7 +1274,8 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
 {
         struct rpc_cred *cred;
         struct inode *inode = dentry->d_inode;
-        struct nfs4_state *state;
+        struct nfs_open_context *ctx;
+        struct nfs4_state *state = NULL;
         int status;
 
         nfs_fattr_init(fattr);
@@ -1283,22 +1283,18 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
         cred = rpcauth_lookupcred(NFS_SERVER(inode)->client->cl_auth, 0);
         if (IS_ERR(cred))
                 return PTR_ERR(cred);
-        /* Search for an existing WRITE delegation first */
-        state = nfs4_open_delegated(inode, FMODE_WRITE, cred);
-        if (!IS_ERR(state)) {
-                /* NB: nfs4_open_delegated() bumps the inode->i_count */
-                iput(inode);
-        } else {
-                /* Search for an existing open(O_WRITE) stateid */
-                state = nfs4_find_state(inode, cred, FMODE_WRITE);
-        }
+
+        /* Search for an existing open(O_WRITE) file */
+        ctx = nfs_find_open_context(inode, cred, FMODE_WRITE);
+        if (ctx != NULL)
+                state = ctx->state;
 
         status = nfs4_do_setattr(NFS_SERVER(inode), fattr,
                         NFS_FH(inode), sattr, state);
         if (status == 0)
                 nfs_setattr_update_inode(inode, sattr);
-        if (state != NULL)
-                nfs4_close_state(state, FMODE_WRITE);
+        if (ctx != NULL)
+                put_nfs_open_context(ctx);
         put_rpccred(cred);
         return status;
 }
@@ -2599,12 +2595,10 @@ int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct
                 case -NFS4ERR_GRACE:
                 case -NFS4ERR_DELAY:
                         ret = nfs4_delay(server->client, &exception->timeout);
-                        if (ret == 0)
-                                exception->retry = 1;
-                        break;
+                        if (ret != 0)
+                                break;
                 case -NFS4ERR_OLD_STATEID:
-                        if (ret == 0)
-                                exception->retry = 1;
+                        exception->retry = 1;
         }
         /* We failed to handle the error */
         return nfs4_map_errors(ret);
@@ -2924,6 +2918,10 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *
         struct nfs4_lock_state *lsp;
         int status;
 
+        /* Is this a delegated lock? */
+        if (test_bit(NFS_DELEGATED_STATE, &state->flags))
+                return do_vfs_lock(request->fl_file, request);
+
         status = nfs4_set_lock_state(state, request);
         if (status != 0)
                 return status;
@@ -3038,6 +3036,9 @@ static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request
         struct nfs4_exception exception = { };
         int err;
 
+        /* Cache the lock if possible... */
+        if (test_bit(NFS_DELEGATED_STATE, &state->flags))
+                return 0;
         do {
                 err = _nfs4_do_setlk(state, F_SETLK, request, 1);
                 if (err != -NFS4ERR_DELAY)
@@ -3053,6 +3054,9 @@ static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request
         struct nfs4_exception exception = { };
         int err;
 
+        err = nfs4_set_lock_state(state, request);
+        if (err != 0)
+                return err;
         do {
                 err = _nfs4_do_setlk(state, F_SETLK, request, 0);
                 if (err != -NFS4ERR_DELAY)
@@ -3068,15 +3072,25 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock
         int status;
 
         down_read(&clp->cl_sem);
-        status = nfs4_set_lock_state(state, request);
-        if (status == 0)
-                status = _nfs4_do_setlk(state, cmd, request, 0);
-        if (status == 0) {
-                /* Note: we always want to sleep here! */
-                request->fl_flags |= FL_SLEEP;
-                if (do_vfs_lock(request->fl_file, request) < 0)
-                        printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __FUNCTION__);
+        /* Is this a delegated open? */
+        if (test_bit(NFS_DELEGATED_STATE, &state->flags)) {
+                /* Yes: cache locks! */
+                status = do_vfs_lock(request->fl_file, request);
+                /* ...but avoid races with delegation recall... */
+                if (status < 0 || test_bit(NFS_DELEGATED_STATE, &state->flags))
+                        goto out;
         }
+        status = nfs4_set_lock_state(state, request);
+        if (status != 0)
+                goto out;
+        status = _nfs4_do_setlk(state, cmd, request, 0);
+        if (status != 0)
+                goto out;
+        /* Note: we always want to sleep here! */
+        request->fl_flags |= FL_SLEEP;
+        if (do_vfs_lock(request->fl_file, request) < 0)
+                printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n", __FUNCTION__);
+out:
         up_read(&clp->cl_sem);
         return status;
 }
@@ -3130,6 +3144,24 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)
         return status;
 }
 
+int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
+{
+        struct nfs_server *server = NFS_SERVER(state->inode);
+        struct nfs4_exception exception = { };
+        int err;
+
+        err = nfs4_set_lock_state(state, fl);
+        if (err != 0)
+                goto out;
+        do {
+                err = _nfs4_do_setlk(state, F_SETLK, fl, 0);
+                if (err != -NFS4ERR_DELAY)
+                        break;
+                err = nfs4_handle_exception(server, err, &exception);
+        } while (exception.retry);
+out:
+        return err;
+}
 
 #define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
 
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 2d5a6a2b9dec..0675f3215e0a 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -69,10 +69,8 @@ init_nfsv4_state(struct nfs_server *server)
 void
 destroy_nfsv4_state(struct nfs_server *server)
 {
-        if (server->mnt_path) {
-                kfree(server->mnt_path);
-                server->mnt_path = NULL;
-        }
+        kfree(server->mnt_path);
+        server->mnt_path = NULL;
         if (server->nfs4_state) {
                 nfs4_put_client(server->nfs4_state);
                 server->nfs4_state = NULL;
@@ -311,8 +309,7 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
                 new = NULL;
         }
         spin_unlock(&clp->cl_lock);
-        if (new)
-                kfree(new);
+        kfree(new);
         if (sp != NULL)
                 return sp;
         put_rpccred(cred);
@@ -366,30 +363,21 @@ nfs4_alloc_open_state(void)
         return state;
 }
 
-static struct nfs4_state *
-__nfs4_find_state(struct inode *inode, struct rpc_cred *cred, mode_t mode)
+void
+nfs4_state_set_mode_locked(struct nfs4_state *state, mode_t mode)
 {
-        struct nfs_inode *nfsi = NFS_I(inode);
-        struct nfs4_state *state;
-
-        mode &= (FMODE_READ|FMODE_WRITE);
-        list_for_each_entry(state, &nfsi->open_states, inode_states) {
-                if (state->owner->so_cred != cred)
-                        continue;
-                if ((mode & FMODE_READ) != 0 && state->nreaders == 0)
-                        continue;
-                if ((mode & FMODE_WRITE) != 0 && state->nwriters == 0)
-                        continue;
-                if ((state->state & mode) != mode)
-                        continue;
-                atomic_inc(&state->count);
-                if (mode & FMODE_READ)
-                        state->nreaders++;
+        if (state->state == mode)
+                return;
+        /* NB! List reordering - see the reclaim code for why.  */
+        if ((mode & FMODE_WRITE) != (state->state & FMODE_WRITE)) {
                 if (mode & FMODE_WRITE)
-                        state->nwriters++;
-                return state;
+                        list_move(&state->open_states, &state->owner->so_states);
+                else
+                        list_move_tail(&state->open_states, &state->owner->so_states);
         }
-        return NULL;
+        if (mode == 0)
+                list_del_init(&state->inode_states);
+        state->state = mode;
 }
 
 static struct nfs4_state *
@@ -400,7 +388,7 @@ __nfs4_find_state_byowner(struct inode *inode, struct nfs4_state_owner *owner)
 
         list_for_each_entry(state, &nfsi->open_states, inode_states) {
                 /* Is this in the process of being freed? */
-                if (state->nreaders == 0 && state->nwriters == 0)
+                if (state->state == 0)
                         continue;
                 if (state->owner == owner) {
                         atomic_inc(&state->count);
@@ -410,17 +398,6 @@ __nfs4_find_state_byowner(struct inode *inode, struct nfs4_state_owner *owner)
         return NULL;
 }
 
-struct nfs4_state *
-nfs4_find_state(struct inode *inode, struct rpc_cred *cred, mode_t mode)
-{
-        struct nfs4_state *state;
-
-        spin_lock(&inode->i_lock);
-        state = __nfs4_find_state(inode, cred, mode);
-        spin_unlock(&inode->i_lock);
-        return state;
-}
-
 static void
 nfs4_free_open_state(struct nfs4_state *state)
 {
@@ -481,7 +458,6 @@ void nfs4_put_open_state(struct nfs4_state *state)
         spin_unlock(&inode->i_lock);
         spin_unlock(&owner->so_lock);
         iput(inode);
-        BUG_ON (state->state != 0);
         nfs4_free_open_state(state);
         nfs4_put_state_owner(owner);
 }
@@ -493,7 +469,7 @@ void nfs4_close_state(struct nfs4_state *state, mode_t mode)
 {
         struct inode *inode = state->inode;
         struct nfs4_state_owner *owner = state->owner;
-        int newstate;
+        int oldstate, newstate = 0;
 
         atomic_inc(&owner->so_count);
         /* Protect against nfs4_find_state() */
@@ -503,30 +479,20 @@ void nfs4_close_state(struct nfs4_state *state, mode_t mode)
                 state->nreaders--;
         if (mode & FMODE_WRITE)
                 state->nwriters--;
-        if (state->nwriters == 0) {
-                if (state->nreaders == 0)
-                        list_del_init(&state->inode_states);
-                /* See reclaim code */
-                list_move_tail(&state->open_states, &owner->so_states);
+        oldstate = newstate = state->state;
+        if (state->nreaders == 0)
+                newstate &= ~FMODE_READ;
+        if (state->nwriters == 0)
+                newstate &= ~FMODE_WRITE;
+        if (test_bit(NFS_DELEGATED_STATE, &state->flags)) {
+                nfs4_state_set_mode_locked(state, newstate);
+                oldstate = newstate;
         }
         spin_unlock(&inode->i_lock);
         spin_unlock(&owner->so_lock);
-        newstate = 0;
-        if (state->state != 0) {
-                if (state->nreaders)
-                        newstate |= FMODE_READ;
-                if (state->nwriters)
-                        newstate |= FMODE_WRITE;
-                if (state->state == newstate)
-                        goto out;
-                if (test_bit(NFS_DELEGATED_STATE, &state->flags)) {
-                        state->state = newstate;
-                        goto out;
-                }
-                if (nfs4_do_close(inode, state, newstate) == 0)
-                        return;
-        }
-out:
+
+        if (oldstate != newstate && nfs4_do_close(inode, state) == 0)
+                return;
         nfs4_put_open_state(state);
         nfs4_put_state_owner(owner);
 }
@@ -815,7 +781,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s
         int status = 0;
 
         for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
-                if (!(fl->fl_flags & FL_POSIX))
+                if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
                         continue;
                 if (((struct nfs_open_context *)fl->fl_file->private_data)->state != state)
                         continue;
@@ -830,7 +796,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s
                         case -NFS4ERR_NO_GRACE:
                         case -NFS4ERR_RECLAIM_BAD:
                         case -NFS4ERR_RECLAIM_CONFLICT:
-                                /* kill_proc(fl->fl_owner, SIGLOST, 1); */
+                                /* kill_proc(fl->fl_pid, SIGLOST, 1); */
                                 break;
                         case -NFS4ERR_STALE_CLIENTID:
                                 goto out_err;
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 43b03b19731b..5f20eafba8ec 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -507,7 +507,7 @@ int nfs_readpage(struct file *file, struct page *page)
                 goto out_error;
 
         if (file == NULL) {
-                ctx = nfs_find_open_context(inode, FMODE_READ);
+                ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
                 if (ctx == NULL)
                         return -EBADF;
         } else
@@ -576,7 +576,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
                         nr_pages);
 
         if (filp == NULL) {
-                desc.ctx = nfs_find_open_context(inode, FMODE_READ);
+                desc.ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
                 if (desc.ctx == NULL)
                         return -EBADF;
         } else
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index f732541a3332..d639d172d568 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -52,8 +52,7 @@ nfs_put_unlinkdata(struct nfs_unlinkdata *data)
 {
         if (--data->count == 0) {
                 nfs_detach_unlinkdata(data);
-                if (data->name.name != NULL)
-                        kfree(data->name.name);
+                kfree(data->name.name);
                 kfree(data);
         }
 }
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 819a65f5071f..8f71e766cc5d 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -294,7 +294,7 @@ int nfs_writepage(struct page *page, struct writeback_control *wbc)
         if (page->index >= end_index+1 || !offset)
                 goto out;
 do_it:
-        ctx = nfs_find_open_context(inode, FMODE_WRITE);
+        ctx = nfs_find_open_context(inode, NULL, FMODE_WRITE);
         if (ctx == NULL) {
                 err = -EBADF;
                 goto out;
@@ -734,14 +734,14 @@ int nfs_updatepage(struct file *file, struct page *page,
                 unsigned int offset, unsigned int count)
 {
         struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data;
-        struct dentry   *dentry = file->f_dentry;
         struct inode    *inode = page->mapping->host;
         struct nfs_page *req;
         int             status = 0;
 
         dprintk("NFS:      nfs_updatepage(%s/%s %d@%Ld)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
-                count, (long long)(page_offset(page) +offset));
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name, count,
+                (long long)(page_offset(page) +offset));
 
         if (IS_SYNC(inode)) {
                 status = nfs_writepage_sync(ctx, inode, page, offset, count, 0);
@@ -850,7 +850,6 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
                 unsigned int count, unsigned int offset,
                 int how)
 {
-        struct rpc_task         *task = &data->task;
         struct inode            *inode;
 
         /* Set up the RPC argument and reply structs
@@ -881,7 +880,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
         data->task.tk_release = nfs_writedata_release;
 
         dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n",
-                task->tk_pid,
+                data->task.tk_pid,
                 inode->i_sb->s_id,
                 (long long)NFS_FILEID(inode),
                 count,
@@ -1217,7 +1216,6 @@ static void nfs_commit_release(struct rpc_task *task)
 static void nfs_commit_rpcsetup(struct list_head *head,
                 struct nfs_write_data *data, int how)
 {
-        struct rpc_task         *task = &data->task;
         struct nfs_page         *first;
         struct inode            *inode;
 
@@ -1248,7 +1246,7 @@ static void nfs_commit_rpcsetup(struct list_head *head,
         /* Release requests */
         data->task.tk_release = nfs_commit_release;
         
-        dprintk("NFS: %4d initiated commit call\n", task->tk_pid);
+        dprintk("NFS: %4d initiated commit call\n", data->task.tk_pid);
 }
 
 /*