We only care the size of regular file in ubifs for quota. The reason is similar with the comment in ubifs_getattr(). Signed-off-by: Dongsheng Yang <yangds.fnst@xxxxxxxxxxxxxx> --- fs/ubifs/dir.c | 3 +++ fs/ubifs/file.c | 19 +++++++++++++++++++ fs/ubifs/ubifs.h | 1 + 3 files changed, 23 insertions(+) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index d430bb6..4230818 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1214,6 +1214,9 @@ const struct file_operations ubifs_dir_operations = { .iterate = ubifs_readdir, .fsync = ubifs_fsync, .unlocked_ioctl = ubifs_ioctl, +#ifdef CONFIG_QUOTA + .get_qsize = ubifs_get_qsize, +#endif #ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl, #endif diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index c4651a8..e916306 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1640,6 +1640,22 @@ static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma) return 0; } +/* + * ubifs_get_qsize: get the quota size of a file + * @inode: inode which we are going to get the qsize + * + * We only care the size of regular file in ubifs + * for quota. The reason is similar with the comment + * in ubifs_getattr(). + */ +ssize_t ubifs_get_qsize(struct inode *inode) +{ + if (S_ISREG(inode->i_mode)) + return i_size_read(inode); + else + return 0; +} + const struct address_space_operations ubifs_file_address_operations = { .readpage = ubifs_readpage, .writepage = ubifs_writepage, @@ -1685,6 +1701,9 @@ const struct file_operations ubifs_file_operations = { .unlocked_ioctl = ubifs_ioctl, .splice_read = generic_file_splice_read, .splice_write = iter_file_splice_write, +#ifdef CONFIG_QUOTA + .get_qsize = ubifs_get_qsize, +#endif #ifdef CONFIG_COMPAT .compat_ioctl = ubifs_compat_ioctl, #endif diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 3b5a204..5e4ed2a 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1761,6 +1761,7 @@ int ubifs_read_block(struct inode *inode, void *addr, unsigned int block, int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync); int ubifs_setattr(struct dentry *dentry, struct iattr *attr); int ubifs_update_time(struct inode *inode, struct timespec *time, int flags); +ssize_t ubifs_get_qsize(struct inode *inode); /* dir.c */ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html