Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

vfs/nfs: fixup for nfs_open_context change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

3 files changed, 5 insertions, 25 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 34193ed69fbe..8b929e6a6eda 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -689,12 +689,6 @@ static int count_semzcnt (struct sem_array * sma, ushort semnum)
         return semzcnt;
 }
 
-static void free_un(struct rcu_head *head)
-{
-        struct sem_undo *un = container_of(head, struct sem_undo, rcu);
-        kfree(un);
-}
-
 /* Free a semaphore set. freeary() is called with sem_ids.rw_mutex locked
  * as a writer and the spinlock for this semaphore set hold. sem_ids.rw_mutex
  * remains locked on exit.
@@ -714,7 +708,7 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
                 un->semid = -1;
                 list_del_rcu(&un->list_proc);
                 spin_unlock(&un->ulp->lock);
-                call_rcu(&un->rcu, free_un);
+                kfree_rcu(un, rcu);
         }
 
         /* Wake up all pending processes and let them fail with EIDRM. */
@@ -1612,7 +1606,7 @@ void exit_sem(struct task_struct *tsk)
                 sem_unlock(sma);
                 wake_up_sem_queue_do(&tasks);
 
-                call_rcu(&un->rcu, free_un);
+                kfree_rcu(un, rcu);
         }
         kfree(ulp);
 }
diff --git a/ipc/shm.c b/ipc/shm.c
index ab3385a21b27..27884adb1a90 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -277,13 +277,13 @@ static int shm_release(struct inode *ino, struct file *file)
         return 0;
 }
 
-static int shm_fsync(struct file *file, int datasync)
+static int shm_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct shm_file_data *sfd = shm_file_data(file);
 
         if (!sfd->file->f_op->fsync)
                 return -EINVAL;
-        return sfd->file->f_op->fsync(sfd->file, datasync);
+        return sfd->file->f_op->fsync(sfd->file, start, end, datasync);
 }
 
 static unsigned long shm_get_unmapped_area(struct file *file,
diff --git a/ipc/util.c b/ipc/util.c
index 5c0d28921ba8..75261a31d48d 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -579,19 +579,6 @@ static void ipc_schedule_free(struct rcu_head *head)
         schedule_work(&sched->work);
 }
 
-/**
- * ipc_immediate_free - free ipc + rcu space
- * @head: RCU callback structure that contains pointer to be freed
- *
- * Free from the RCU callback context.
- */
-static void ipc_immediate_free(struct rcu_head *head)
-{
-        struct ipc_rcu_grace *free =
-                container_of(head, struct ipc_rcu_grace, rcu);
-        kfree(free);
-}
-
 void ipc_rcu_putref(void *ptr)
 {
         if (--container_of(ptr, struct ipc_rcu_hdr, data)->refcount > 0)
@@ -601,8 +588,7 @@ void ipc_rcu_putref(void *ptr)
                 call_rcu(&container_of(ptr, struct ipc_rcu_grace, data)->rcu,
                                 ipc_schedule_free);
         } else {
-                call_rcu(&container_of(ptr, struct ipc_rcu_grace, data)->rcu,
-                                ipc_immediate_free);
+                kfree_rcu(container_of(ptr, struct ipc_rcu_grace, data), rcu);
         }
 }