diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 3 | ||||
| -rw-r--r-- | include/linux/quota.h | 2 | ||||
| -rw-r--r-- | include/linux/security.h | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7bbe6e3838dc..2d369c688cd2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -992,6 +992,9 @@ struct super_operations { void (*umount_begin) (struct super_block *); int (*show_options)(struct seq_file *, struct vfsmount *); + + ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); + ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); }; /* Inode state bits. Protected by inode_lock. */ diff --git a/include/linux/quota.h b/include/linux/quota.h index f4cbf4636f3e..a279602bbb94 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -285,7 +285,7 @@ struct quota_info { struct semaphore dqio_sem; /* lock device while I/O in progress */ struct semaphore dqonoff_sem; /* Serialize quotaon & quotaoff */ struct rw_semaphore dqptr_sem; /* serialize ops using quota_info struct, pointers from inode to dquots */ - struct file *files[MAXQUOTAS]; /* fp's to quotafiles */ + struct inode *files[MAXQUOTAS]; /* inodes of quotafiles */ struct mem_dqinfo info[MAXQUOTAS]; /* Information for each quota type */ struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */ }; diff --git a/include/linux/security.h b/include/linux/security.h index 5f56f92e9569..4e0795b5a276 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1034,7 +1034,7 @@ struct security_operations { int (*sysctl) (struct ctl_table * table, int op); int (*capable) (struct task_struct * tsk, int cap); int (*quotactl) (int cmds, int type, int id, struct super_block * sb); - int (*quota_on) (struct file * f); + int (*quota_on) (struct dentry * dentry); int (*syslog) (int type); int (*settime) (struct timespec *ts, struct timezone *tz); int (*vm_enough_memory) (long pages); @@ -1281,9 +1281,9 @@ static inline int security_quotactl (int cmds, int type, int id, return security_ops->quotactl (cmds, type, id, sb); } -static inline int security_quota_on (struct file * file) +static inline int security_quota_on (struct dentry * dentry) { - return security_ops->quota_on (file); + return security_ops->quota_on (dentry); } static inline int security_syslog(int type) @@ -1959,7 +1959,7 @@ static inline int security_quotactl (int cmds, int type, int id, return 0; } -static inline int security_quota_on (struct file * file) +static inline int security_quota_on (struct dentry * dentry) { return 0; } |