27 files changed, 525 insertions, 269 deletions

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 46f8ef42559e..8c7852742f4b 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -446,7 +446,7 @@ ashmem_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
                 loff_t start = range->pgstart * PAGE_SIZE;
                 loff_t end = (range->pgend + 1) * PAGE_SIZE;
 
-                do_fallocate(range->asma->file,
+                vfs_fallocate(range->asma->file,
                                 FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
                                 start, end - start);
                 range->purged = ASHMEM_WAS_PURGED;
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 77c9a7812542..214c3c11fbc2 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -443,7 +443,7 @@ int ioctl_preallocate(struct file *filp, void __user *argp)
                 return -EINVAL;
         }
 
-        return do_fallocate(filp, FALLOC_FL_KEEP_SIZE, sr.l_start, sr.l_len);
+        return vfs_fallocate(filp, FALLOC_FL_KEEP_SIZE, sr.l_start, sr.l_len);
 }
 
 static int file_ioctl(struct file *filp, unsigned int cmd,
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 9106f42c472c..1cc6ec51e6b1 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -214,7 +214,7 @@ int nsm_monitor(const struct nlm_host *host)
         if (unlikely(res.status != 0))
                 status = -EIO;
         if (unlikely(status < 0)) {
-                printk(KERN_NOTICE "lockd: cannot monitor %s\n", nsm->sm_name);
+                pr_notice_ratelimited("lockd: cannot monitor %s\n", nsm->sm_name);
                 return status;
         }
 
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index d1bb7ecfd201..e94c887da2d7 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -350,7 +350,7 @@ static struct svc_serv *lockd_create_svc(void)
                 printk(KERN_WARNING
                         "lockd_up: no pid, %d users??\n", nlmsvc_users);
 
-        serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, NULL);
+        serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, svc_rpcb_cleanup);
         if (!serv) {
                 printk(KERN_WARNING "lockd_up: create service failed\n");
                 return ERR_PTR(-ENOMEM);
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 0beb023f25ac..ac71d13c69ef 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -33,6 +33,7 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <linux/file.h>
+#include <linux/falloc.h>
 #include <linux/slab.h>
 
 #include "idmap.h"
@@ -772,7 +773,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
          * the client wants us to do more in this compound:
          */
         if (!nfsd4_last_compound_op(rqstp))
-                rqstp->rq_splice_ok = false;
+                clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);
 
         /* check stateid */
         if ((status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),
@@ -1014,6 +1015,44 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 }
 
 static __be32
+nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                struct nfsd4_fallocate *fallocate, int flags)
+{
+        __be32 status = nfserr_notsupp;
+        struct file *file;
+
+        status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate,
+                                            &fallocate->falloc_stateid,
+                                            WR_STATE, &file);
+        if (status != nfs_ok) {
+                dprintk("NFSD: nfsd4_fallocate: couldn't process stateid!\n");
+                return status;
+        }
+
+        status = nfsd4_vfs_fallocate(rqstp, &cstate->current_fh, file,
+                                     fallocate->falloc_offset,
+                                     fallocate->falloc_length,
+                                     flags);
+        fput(file);
+        return status;
+}
+
+static __be32
+nfsd4_allocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+               struct nfsd4_fallocate *fallocate)
+{
+        return nfsd4_fallocate(rqstp, cstate, fallocate, 0);
+}
+
+static __be32
+nfsd4_deallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+                 struct nfsd4_fallocate *fallocate)
+{
+        return nfsd4_fallocate(rqstp, cstate, fallocate,
+                               FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE);
+}
+
+static __be32
 nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 struct nfsd4_seek *seek)
 {
@@ -1331,7 +1370,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
          * Don't use the deferral mechanism for NFSv4; compounds make it
          * too hard to avoid non-idempotency problems.
          */
-        rqstp->rq_usedeferral = false;
+        clear_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
 
         /*
          * According to RFC3010, this takes precedence over all other errors.
@@ -1447,7 +1486,7 @@ encode_op:
         BUG_ON(cstate->replay_owner);
 out:
         /* Reset deferral mechanism for RPC deferrals */
-        rqstp->rq_usedeferral = true;
+        set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);
         dprintk("nfsv4 compound returned %d\n", ntohl(status));
         return status;
 }
@@ -1929,6 +1968,18 @@ static struct nfsd4_operation nfsd4_ops[] = {
         },
 
         /* NFSv4.2 operations */
+        [OP_ALLOCATE] = {
+                .op_func = (nfsd4op_func)nfsd4_allocate,
+                .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+                .op_name = "OP_ALLOCATE",
+                .op_rsize_bop = (nfsd4op_rsize)nfsd4_write_rsize,
+        },
+        [OP_DEALLOCATE] = {
+                .op_func = (nfsd4op_func)nfsd4_deallocate,
+                .op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,
+                .op_name = "OP_DEALLOCATE",
+                .op_rsize_bop = (nfsd4op_rsize)nfsd4_write_rsize,
+        },
         [OP_SEEK] = {
                 .op_func = (nfsd4op_func)nfsd4_seek,
                 .op_name = "OP_SEEK",
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 4e1d7268b004..3550a9c87616 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -275,9 +275,11 @@ opaque_hashval(const void *ptr, int nbytes)
         return x;
 }
 
-static void nfsd4_free_file(struct nfs4_file *f)
+static void nfsd4_free_file_rcu(struct rcu_head *rcu)