Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit deb21db7788b97a2bccdefe605433ef97f482689

Authored by Erez Zadok
Committed by Linus Torvalds
1 parent c9845ff1df
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

VFS: swap do_ioctl and vfs_ioctl names 

Rename old vfs_ioctl to do_ioctl, because the comment above it clearly
indicates that it is an internal function not to be exported to modules;
therefore it should have a more traditional do_XXX name.  The new do_ioctl
is exported in fs.h but not to modules.

Rename the old do_ioctl to vfs_ioctl because the names vfs_XXX should
preferably be reserved to callable VFS functions which modules may call, as
many other vfs_XXX functions already do.  Export the new vfs_ioctl to GPL
modules so others can use it (including Unionfs and eCryptfs).  Add DocBook
for new vfs_ioctl.

[akpm@linux-foundation.org: fix build]
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 24 additions and 10 deletions Side-by-side Diff

... ... @@ -2986,7 +2986,7 @@
2986 2986 }
2987 2987  
2988 2988 do_ioctl:
2989   - error = vfs_ioctl(filp, fd, cmd, arg);
  2989 + error = do_vfs_ioctl(filp, fd, cmd, arg);
2990 2990 out_fput:
2991 2991 fput_light(filp, fput_needed);
2992 2992 out:
... ... @@ -16,8 +16,20 @@
16 16  
17 17 #include <asm/ioctls.h>
18 18  
19   -static long do_ioctl(struct file *filp, unsigned int cmd,
20   - unsigned long arg)
  19 +/**
  20 + * vfs_ioctl - call filesystem specific ioctl methods
  21 + * @filp: [in] open file to invoke ioctl method on
  22 + * @cmd: [in] ioctl command to execute
  23 + * @arg: [in/out] command-specific argument for ioctl
  24 + *
  25 + * Invokes filesystem specific ->unlocked_ioctl, if one exists; otherwise
  26 + * invokes * filesystem specific ->ioctl method. If neither method exists,
  27 + * returns -ENOTTY.
  28 + *
  29 + * Returns 0 on success, -errno on error.
  30 + */
  31 +long vfs_ioctl(struct file *filp, unsigned int cmd,
  32 + unsigned long arg)
21 33 {
22 34 int error = -ENOTTY;
23 35  
24 36  
25 37  
... ... @@ -72,18 +84,18 @@
72 84 return put_user(i_size_read(inode) - filp->f_pos, p);
73 85 }
74 86  
75   - return do_ioctl(filp, cmd, arg);
  87 + return vfs_ioctl(filp, cmd, arg);
76 88 }
77 89  
78 90 /*
79 91 * When you add any new common ioctls to the switches above and below
80 92 * please update compat_sys_ioctl() too.
81 93 *
82   - * vfs_ioctl() is not for drivers and not intended to be EXPORT_SYMBOL()'d.
  94 + * do_vfs_ioctl() is not for drivers and not intended to be EXPORT_SYMBOL()'d.
83 95 * It's just a simple helper for sys_ioctl and compat_sys_ioctl.
84 96 */
85   -int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
86   - unsigned long arg)
  97 +int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
  98 + unsigned long arg)
87 99 {
88 100 unsigned int flag;
89 101 int on, error = 0;
... ... @@ -152,7 +164,7 @@
152 164 if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
153 165 error = file_ioctl(filp, cmd, arg);
154 166 else
155   - error = do_ioctl(filp, cmd, arg);
  167 + error = vfs_ioctl(filp, cmd, arg);
156 168 break;
157 169 }
158 170 return error;
... ... @@ -172,7 +184,7 @@
172 184 if (error)
173 185 goto out_fput;
174 186  
175   - error = vfs_ioctl(filp, fd, cmd, arg);
  187 + error = do_vfs_ioctl(filp, fd, cmd, arg);
176 188 out_fput:
177 189 fput_light(filp, fput_needed);
178 190 out:
... ... @@ -1941,7 +1941,9 @@
1941 1941 extern int vfs_lstat_fd(int dfd, char __user *, struct kstat *);
1942 1942 extern int vfs_fstat(unsigned int, struct kstat *);
1943 1943  
1944   -extern int vfs_ioctl(struct file *, unsigned int, unsigned int, unsigned long);
  1944 +extern long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
  1945 +extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
  1946 + unsigned long arg);
1945 1947  
1946 1948 extern void get_filesystem(struct file_system_type *fs);
1947 1949 extern void put_filesystem(struct file_system_type *fs);