diff options
| author |   Luis Henriques <lhenriques@suse.com> | 2020-04-07 11:30:19 +0100 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2020-06-01 13:22:53 +0200 |
| commit | daa668fbacfdb9147b1828fc0f97b685bf4a51e3 (patch) | |
| tree | 6b8118133f573c50eb77686e6f6d7b12854f5eef | |
| parent | ceph: ceph_kick_flushing_caps needs the s_mutex (diff) | |
| download | linux-dev-daa668fbacfdb9147b1828fc0f97b685bf4a51e3.tar.xz linux-dev-daa668fbacfdb9147b1828fc0f97b685bf4a51e3.zip | |
ceph: normalize 'delta' parameter usage in check_quota_exceeded
Function check_quota_exceeded() uses delta parameter only for the
QUOTA_CHECK_MAX_BYTES_OP operation. Using this parameter also for
MAX_FILES will makes the code cleaner and will be required to support
cross-quota-tree renames.
Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
| -rw-r--r-- | fs/ceph/quota.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c index 19507e2fdb57..7377838d3f8b 100644 --- a/fs/ceph/quota.c +++ b/fs/ceph/quota.c @@ -361,8 +361,6 @@ restart: spin_unlock(&ci->i_ceph_lock); switch (op) { case QUOTA_CHECK_MAX_FILES_OP: - exceeded = (max && (rvalue >= max)); - break; case QUOTA_CHECK_MAX_BYTES_OP: exceeded = (max && (rvalue + delta > max)); break; @@ -417,7 +415,7 @@ bool ceph_quota_is_max_files_exceeded(struct inode *inode) WARN_ON(!S_ISDIR(inode->i_mode)); - return check_quota_exceeded(inode, QUOTA_CHECK_MAX_FILES_OP, 0); + return check_quota_exceeded(inode, QUOTA_CHECK_MAX_FILES_OP, 1); } /* |