Merge branch 'master' into next

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 39 insertions, 24 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6048b55f2878..1d5ae39cb271 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1002,13 +1002,9 @@ fb_blank(struct fb_info *info, int blank)
         return ret;
 }
 
-static long
-fb_ioctl(struct file *file, unsigned int cmd,
-         unsigned long arg)
+static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+                        unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info;
         struct fb_ops *fb;
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
@@ -1018,14 +1014,10 @@ fb_ioctl(struct file *file, unsigned int cmd,
         void __user *argp = (void __user *)arg;
         long ret = 0;
 
-        info = registered_fb[fbidx];
-        mutex_lock(&info->lock);
         fb = info->fbops;
-
-        if (!fb) {
-                mutex_unlock(&info->lock);
+        if (!fb)
                 return -ENODEV;
-        }
+
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
                 ret = copy_to_user(argp, &info->var,
@@ -1126,6 +1118,21 @@ fb_ioctl(struct file *file, unsigned int cmd,
                 else
                         ret = fb->fb_ioctl(info, cmd, arg);
         }
+        return ret;
+}
+
+static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+__acquires(&info->lock)
+__releases(&info->lock)
+{
+        struct inode *inode = file->f_path.dentry->d_inode;
+        int fbidx = iminor(inode);
+        struct fb_info *info;
+        long ret;
+
+        info = registered_fb[fbidx];
+        mutex_lock(&info->lock);
+        ret = do_fb_ioctl(info, cmd, arg);
         mutex_unlock(&info->lock);
         return ret;
 }
@@ -1157,8 +1164,8 @@ struct fb_cmap32 {
         compat_caddr_t  transp;
 };
 
-static int fb_getput_cmap(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static int fb_getput_cmap(struct fb_info *info, unsigned int cmd,
+                          unsigned long arg)
 {
         struct fb_cmap_user __user *cmap;
         struct fb_cmap32 __user *cmap32;
@@ -1181,7 +1188,7 @@ static int fb_getput_cmap(struct inode *inode, struct file *file,
             put_user(compat_ptr(data), &cmap->transp))
                 return -EFAULT;
 
-        err = fb_ioctl(file, cmd, (unsigned long) cmap);
+        err = do_fb_ioctl(info, cmd, (unsigned long) cmap);
 
         if (!err) {
                 if (copy_in_user(&cmap32->start,
@@ -1223,8 +1230,8 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
         return err;
 }
 
-static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg)
+static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
+                              unsigned long arg)
 {
         mm_segment_t old_fs;
         struct fb_fix_screeninfo fix;
@@ -1235,7 +1242,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
 
         old_fs = get_fs();
         set_fs(KERNEL_DS);
-        err = fb_ioctl(file, cmd, (unsigned long) &fix);
+        err = do_fb_ioctl(info, cmd, (unsigned long) &fix);
         set_fs(old_fs);
 
         if (!err)
@@ -1244,8 +1251,10 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
         return err;
 }
 
-static long
-fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long fb_compat_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long arg)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
@@ -1262,16 +1271,16 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case FBIOPUT_CON2FBMAP:
                 arg = (unsigned long) compat_ptr(arg);
         case FBIOBLANK:
-                mutex_unlock(&info->lock);
-                return fb_ioctl(file, cmd, arg);
+                ret = do_fb_ioctl(info, cmd, arg);
+                break;
 
         case FBIOGET_FSCREENINFO:
-                ret = fb_get_fscreeninfo(inode, file, cmd, arg);
+                ret = fb_get_fscreeninfo(info, cmd, arg);
                 break;
 
         case FBIOGETCMAP:
         case FBIOPUTCMAP:
-                ret = fb_getput_cmap(inode, file, cmd, arg);
+                ret = fb_getput_cmap(info, cmd, arg);
                 break;
 
         default:
@@ -1286,6 +1295,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 static int
 fb_mmap(struct file *file, struct vm_area_struct * vma)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         int fbidx = iminor(file->f_path.dentry->d_inode);
         struct fb_info *info = registered_fb[fbidx];
@@ -1339,6 +1350,8 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 
 static int
 fb_open(struct inode *inode, struct file *file)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         int fbidx = iminor(inode);
         struct fb_info *info;
@@ -1374,6 +1387,8 @@ out:
 
 static int 
 fb_release(struct inode *inode, struct file *file)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         struct fb_info * const info = file->private_data;