diff options
| author | Matthew Wilcox <willy@debian.org> | 2004-08-12 19:48:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-12 19:48:04 -0700 |
| commit | 401f0fbde0a3cb8a6a36f1e24ed78880faeee318 (patch) | |
| tree | 3708938cbf6e88879d5a88896a8e766f8b4101e3 /include/linux/fs.h | |
| parent | 15aeed9352711084abde5f6b4cd4e0b29f5f83ba (diff) | |
[PATCH] Remove fcntl f_op
The newly introduced ->fcntl file_operation is badly thought out,
not to mention undocumented. This patch replaces it with two better
defined operations -- check_flags and dir_notify. Any other fcntl()s
that filesystems are interested in can have their own properly typed
f_op method when they need it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index e6f97b00fe34..7e10a252a7d1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -665,9 +665,6 @@ extern struct list_head file_lock_list; #include <linux/fcntl.h> -extern long generic_file_fcntl(int fd, unsigned int cmd, - unsigned long arg, struct file *filp); - extern int fcntl_getlk(struct file *, struct flock __user *); extern int fcntl_setlk(struct file *, unsigned int, struct flock __user *); @@ -895,8 +892,8 @@ struct file_operations { ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *); ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); - long (*fcntl)(int fd, unsigned int cmd, - unsigned long arg, struct file *filp); + int (*check_flags)(int); + int (*dir_notify)(struct file *filp, unsigned long arg); }; struct inode_operations { |