Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[firefly-linux-kernel-4.4.55.git] / fs / nfs / delegation.c

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 7f3f60641344437ab4f493eebf6093e39957c3be..da5433230bb1960bc78bafc17ced89f3bca76b65 100644 (file)
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -85,25 +85,30 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
 {
        struct inode *inode = state->inode;
        struct file_lock *fl;
+       struct file_lock_context *flctx = inode->i_flctx;
+       struct list_head *list;
        int status = 0;
 
-       if (inode->i_flock == NULL)
+       if (flctx == NULL)
                goto out;
 
-       /* Protect inode->i_flock using the i_lock */
-       spin_lock(&inode->i_lock);
-       for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
-               if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
-                       continue;
+       list = &flctx->flc_posix;
+       spin_lock(&flctx->flc_lock);
+restart:
+       list_for_each_entry(fl, list, fl_list) {
                if (nfs_file_open_context(fl->fl_file) != ctx)
                        continue;
-               spin_unlock(&inode->i_lock);
+               spin_unlock(&flctx->flc_lock);
                status = nfs4_lock_delegation_recall(fl, state, stateid);
                if (status < 0)
                        goto out;
-               spin_lock(&inode->i_lock);
+               spin_lock(&flctx->flc_lock);
        }
-       spin_unlock(&inode->i_lock);
+       if (list == &flctx->flc_posix) {
+               list = &flctx->flc_flock;
+               goto restart;
+       }
+       spin_unlock(&flctx->flc_lock);
 out:
        return status;
 }
@@ -301,6 +306,17 @@ nfs_inode_detach_delegation(struct inode *inode)
        return nfs_detach_delegation(nfsi, delegation, server);
 }
 
+static void
+nfs_update_inplace_delegation(struct nfs_delegation *delegation,
+               const struct nfs_delegation *update)
+{
+       if (nfs4_stateid_is_newer(&update->stateid, &delegation->stateid)) {
+               delegation->stateid.seqid = update->stateid.seqid;
+               smp_wmb();
+               delegation->type = update->type;
+       }
+}
+
 /**
  * nfs_inode_set_delegation - set up a delegation on an inode
  * @inode: inode to which delegation applies
@@ -334,9 +350,12 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
        old_delegation = rcu_dereference_protected(nfsi->delegation,
                                        lockdep_is_held(&clp->cl_lock));
        if (old_delegation != NULL) {
-               if (nfs4_stateid_match(&delegation->stateid,
-                                       &old_delegation->stateid) &&
-                               delegation->type == old_delegation->type) {
+               /* Is this an update of the existing delegation? */
+               if (nfs4_stateid_match_other(&old_delegation->stateid,
+                                       &delegation->stateid)) {
+                       nfs_update_inplace_delegation(old_delegation,
+                                       delegation);
+                       nfsi->delegation_state = old_delegation->type;
                        goto out;
                }
                /*