Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  BKL-removal: Implement a compat_ioctl handler for JFS
  BKL-removal: Use unlocked_ioctl for jfs

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 87eb93694af75832c792f1863c3edbe13d6c5c56..7f6063acaa3b2460c395ced0da2c82bb21a579b2 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -112,5 +112,8 @@ const struct file_operations jfs_file_operations = {
        .splice_write   = generic_file_splice_write,
        .fsync          = jfs_fsync,
        .release        = jfs_release,
-       .ioctl          = jfs_ioctl,
+       .unlocked_ioctl = jfs_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = jfs_compat_ioctl,
+#endif
 };

diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c
index dfda12a073e1985fb28b798df2e9088a9a996be4..a1f8e375ad2114f2e75669f7a817bdf20baa6fdc 100644 (file)
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -51,9 +51,9 @@ static long jfs_map_ext2(unsigned long flags, int from)
 }
 
 
-int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
-               unsigned long arg)
+long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
+       struct inode *inode = filp->f_dentry->d_inode;
        struct jfs_inode_info *jfs_inode = JFS_IP(inode);
        unsigned int flags;
 
@@ -82,6 +82,10 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
                /* Is it quota file? Do not allow user to mess with it */
                if (IS_NOQUOTA(inode))
                        return -EPERM;
+
+               /* Lock against other parallel changes of flags */
+               mutex_lock(&inode->i_mutex);
+
                jfs_get_inode_flags(jfs_inode);
                oldflags = jfs_inode->mode2;
 
@@ -92,8 +96,10 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
                if ((oldflags & JFS_IMMUTABLE_FL) ||
                        ((flags ^ oldflags) &
                        (JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {
-                       if (!capable(CAP_LINUX_IMMUTABLE))
+                       if (!capable(CAP_LINUX_IMMUTABLE)) {
+                               mutex_unlock(&inode->i_mutex);
                                return -EPERM;
+                       }
                }
 
                flags = flags & JFS_FL_USER_MODIFIABLE;
@@ -101,6 +107,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
                jfs_inode->mode2 = flags;
 
                jfs_set_inode_flags(inode);
+               mutex_unlock(&inode->i_mutex);
                inode->i_ctime = CURRENT_TIME_SEC;
                mark_inode_dirty(inode);
                return 0;
@@ -110,3 +117,21 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,
        }
 }
 
+#ifdef CONFIG_COMPAT
+long jfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+       /* While these ioctl numbers defined with 'long' and have different
+        * numbers than the 64bit ABI,
+        * the actual implementation only deals with ints and is compatible.
+        */
+       switch (cmd) {
+       case JFS_IOC_GETFLAGS32:
+               cmd = JFS_IOC_GETFLAGS;
+               break;
+       case JFS_IOC_SETFLAGS32:
+               cmd = JFS_IOC_SETFLAGS;
+               break;
+       }
+       return jfs_ioctl(filp, cmd, arg);
+}
+#endif

diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h
index c387540d34255334431ef4f02a995ae7399cb273..395c4c0d0f0667bf0f8e604d2e9b4b3eb1600698 100644 (file)
--- a/fs/jfs/jfs_dinode.h
+++ b/fs/jfs/jfs_dinode.h
@@ -170,5 +170,7 @@ struct dinode {
 #define JFS_IOC_GETFLAGS       _IOR('f', 1, long)
 #define JFS_IOC_SETFLAGS       _IOW('f', 2, long)
 
+#define JFS_IOC_GETFLAGS32     _IOR('f', 1, int)
+#define JFS_IOC_SETFLAGS32     _IOW('f', 2, int)
 
 #endif /*_H_JFS_DINODE */

diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index 95a6a11425e595e75d503ac1d4a5a1fb0fdde6a8..adb2fafcc54428d2542b76191e93c8ffff3bd454 100644 (file)
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -22,8 +22,8 @@ struct fid;
 
 extern struct inode *ialloc(struct inode *, umode_t);
 extern int jfs_fsync(struct file *, struct dentry *, int);
-extern int jfs_ioctl(struct inode *, struct file *,
-                       unsigned int, unsigned long);
+extern long jfs_ioctl(struct file *, unsigned int, unsigned long);
+extern long jfs_compat_ioctl(struct file *, unsigned int, unsigned long);
 extern struct inode *jfs_iget(struct super_block *, unsigned long);
 extern int jfs_commit_inode(struct inode *, int);
 extern int jfs_write_inode(struct inode*, int);

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 403cfc24c6fe23155848e771c97ef344e3fc17a5..0ba6778edaa2ae73d9595d8f425c7d3e98dce7a7 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1556,7 +1556,10 @@ const struct file_operations jfs_dir_operations = {
        .read           = generic_read_dir,
        .readdir        = jfs_readdir,
        .fsync          = jfs_fsync,
-       .ioctl          = jfs_ioctl,
+       .unlocked_ioctl = jfs_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = jfs_compat_ioctl,
+#endif
 };
 
 static int jfs_ci_hash(struct dentry *dir, struct qstr *this)