7 files changed, 20 insertions, 52 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index fc0f12ba89cc..24d2fbf549bd 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;
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 53969022d239..b7f262dcb6e3 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -247,7 +247,6 @@ 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);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 02fddd0e27e8..9e492c2261c0 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -214,7 +214,7 @@ 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);
         memcpy(&state->stateid, stateid, sizeof(state->stateid));
@@ -1274,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);
@@ -1282,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;
 }
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 959374d833a7..81d964bfd8a7 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -384,28 +384,6 @@ nfs4_state_set_mode_locked(struct nfs4_state *state, mode_t mode)
 }
 
 static struct nfs4_state *
-__nfs4_find_state(struct inode *inode, struct rpc_cred *cred, 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 ((state->state & mode) != mode)
-                        continue;
-                atomic_inc(&state->count);
-                if (mode & FMODE_READ)
-                        state->nreaders++;
-                if (mode & FMODE_WRITE)
-                        state->nwriters++;
-                return state;
-        }
-        return NULL;
-}
-
-static struct nfs4_state *
 __nfs4_find_state_byowner(struct inode *inode, struct nfs4_state_owner *owner)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
@@ -423,17 +401,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)
 {
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/write.c b/fs/nfs/write.c
index 819a65f5071f..1bdbd4f9fdd2 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;
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 325fe7ae49bb..12787a9b0259 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -316,7 +316,7 @@ extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, st
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx);
-extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, int mode);
+extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
 extern void nfs_file_clear_open_context(struct file *filp);
 
 /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */