Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ef1fc2f01e02951a0d8520ec3aa0b38606d74b55
Commit:     ef1fc2f01e02951a0d8520ec3aa0b38606d74b55
Parent:     baab81fa518ecfac597402b462631f5593926623
Author:     Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 27 17:02:02 2008 -0600
Committer:  Dave Kleikamp <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 13:45:29 2008 -0600

    BKL-removal: Implement a compat_ioctl handler for JFS
    
    The ioctls were already compatible except for the actual values so this
    was fairly easy to do.
    
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Dave Kleikamp <[EMAIL PROTECTED]>
---
 fs/jfs/file.c       |    3 +++
 fs/jfs/ioctl.c      |   18 ++++++++++++++++++
 fs/jfs/jfs_dinode.h |    2 ++
 fs/jfs/jfs_inode.h  |    1 +
 fs/jfs/namei.c      |    3 +++
 5 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 713ff4c..7f6063a 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -113,4 +113,7 @@ const struct file_operations jfs_file_operations = {
        .fsync          = jfs_fsync,
        .release        = jfs_release,
        .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 fc82ecc..a1f8e37 100644
--- a/fs/jfs/ioctl.c
+++ b/fs/jfs/ioctl.c
@@ -117,3 +117,21 @@ long jfs_ioctl(struct file *filp, unsigned int cmd, 
unsigned long arg)
        }
 }
 
+#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 c387540..395c4c0 100644
--- 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 570fd5e..adb2faf 100644
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -23,6 +23,7 @@ struct fid;
 extern struct inode *ialloc(struct inode *, umode_t);
 extern int jfs_fsync(struct file *, struct dentry *, int);
 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 6440904..0ba6778 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -1557,6 +1557,9 @@ const struct file_operations jfs_dir_operations = {
        .readdir        = jfs_readdir,
        .fsync          = jfs_fsync,
        .unlocked_ioctl = jfs_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = jfs_compat_ioctl,
+#endif
 };
 
 static int jfs_ci_hash(struct dentry *dir, struct qstr *this)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to