diff options
| author |  Jan Kara <jack@suse.cz>
| 2015-01-30 10:16:33 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz>
| 2015-01-30 10:16:33 +0100 |
| commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
| tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /fs/xfs/xfs_quotaops.c | |
| parent | xfs: Remove some pointless quota checks (diff) | |
| parent | quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units (diff) | |
| download | linux-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.tar.gz linux-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.tar.bz2 linux-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.zip | |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'fs/xfs/xfs_quotaops.c')
| -rw-r--r-- | fs/xfs/xfs_quotaops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c index 8fcd20dbf89a..a226203fa46a 100644 --- a/fs/xfs/xfs_quotaops.c +++ b/fs/xfs/xfs_quotaops.c @@ -131,7 +131,7 @@ STATIC int xfs_fs_get_dqblk( struct super_block *sb, struct kqid qid, - struct fs_disk_quota *fdq) + struct qc_dqblk *qdq) { struct xfs_mount *mp = XFS_M(sb); @@ -141,14 +141,14 @@ xfs_fs_get_dqblk( return -ESRCH; return xfs_qm_scall_getquota(mp, from_kqid(&init_user_ns, qid), - xfs_quota_type(qid.type), fdq); + xfs_quota_type(qid.type), qdq); } STATIC int xfs_fs_set_dqblk( struct super_block *sb, struct kqid qid, - struct fs_disk_quota *fdq) + struct qc_dqblk *qdq) { struct xfs_mount *mp = XFS_M(sb); @@ -160,7 +160,7 @@ xfs_fs_set_dqblk( return -ESRCH; return xfs_qm_scall_setqlim(mp, from_kqid(&init_user_ns, qid), - xfs_quota_type(qid.type), fdq); + xfs_quota_type(qid.type), qdq); } const struct quotactl_ops xfs_quotactl_operations = { |