* [PATCH] ceph: ensure we have Fs caps when fetching dir link count
@ 2020-11-10 12:03 Jeff Layton
2020-11-10 15:38 ` Jeff Layton
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Layton @ 2020-11-10 12:03 UTC (permalink / raw)
To: ceph-devel; +Cc: pdonnell
The link count for a directory is defined as inode->i_subdirs + 2,
(for "." and ".."). i_subdirs is only populated when Fs caps are held.
Ensure we grab Fs caps when fetching the link count for a directory.
URL: https://tracker.ceph.com/issues/48125
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/ceph/inode.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 7c22bc2ea076..9ba15ca6b010 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -2343,15 +2343,22 @@ int ceph_permission(struct inode *inode, int mask)
}
/* Craft a mask of needed caps given a set of requested statx attrs. */
-static int statx_to_caps(u32 want)
+static int statx_to_caps(u32 want, umode_t mode)
{
int mask = 0;
if (want & (STATX_MODE|STATX_UID|STATX_GID|STATX_CTIME|STATX_BTIME))
mask |= CEPH_CAP_AUTH_SHARED;
- if (want & (STATX_NLINK|STATX_CTIME))
+ if (want & (STATX_NLINK|STATX_CTIME)) {
mask |= CEPH_CAP_LINK_SHARED;
+ /*
+ * The link count for directories depends on inode->i_subdirs,
+ * and that is only updated when Fs caps are held.
+ */
+ if (S_ISDIR(mode))
+ mask |= CEPH_CAP_FILE_SHARED;
+ }
if (want & (STATX_ATIME|STATX_MTIME|STATX_CTIME|STATX_SIZE|
STATX_BLOCKS))
@@ -2377,7 +2384,7 @@ int ceph_getattr(const struct path *path, struct kstat *stat,
/* Skip the getattr altogether if we're asked not to sync */
if (!(flags & AT_STATX_DONT_SYNC)) {
- err = ceph_do_getattr(inode, statx_to_caps(request_mask),
+ err = ceph_do_getattr(inode, statx_to_caps(request_mask, inode->i_mode),
flags & AT_STATX_FORCE_SYNC);
if (err)
return err;
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ceph: ensure we have Fs caps when fetching dir link count
2020-11-10 12:03 [PATCH] ceph: ensure we have Fs caps when fetching dir link count Jeff Layton
@ 2020-11-10 15:38 ` Jeff Layton
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Layton @ 2020-11-10 15:38 UTC (permalink / raw)
To: ceph-devel; +Cc: pdonnell, Ilya Dryomov
On Tue, 2020-11-10 at 07:03 -0500, Jeff Layton wrote:
> The link count for a directory is defined as inode->i_subdirs + 2,
> (for "." and ".."). i_subdirs is only populated when Fs caps are held.
> Ensure we grab Fs caps when fetching the link count for a directory.
>
> URL: https://tracker.ceph.com/issues/48125
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/ceph/inode.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
> index 7c22bc2ea076..9ba15ca6b010 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -2343,15 +2343,22 @@ int ceph_permission(struct inode *inode, int mask)
> }
>
>
>
>
> /* Craft a mask of needed caps given a set of requested statx attrs. */
> -static int statx_to_caps(u32 want)
> +static int statx_to_caps(u32 want, umode_t mode)
> {
> int mask = 0;
>
>
>
>
> if (want & (STATX_MODE|STATX_UID|STATX_GID|STATX_CTIME|STATX_BTIME))
> mask |= CEPH_CAP_AUTH_SHARED;
>
>
>
>
> - if (want & (STATX_NLINK|STATX_CTIME))
> + if (want & (STATX_NLINK|STATX_CTIME)) {
> mask |= CEPH_CAP_LINK_SHARED;
> + /*
> + * The link count for directories depends on inode->i_subdirs,
> + * and that is only updated when Fs caps are held.
> + */
> + if (S_ISDIR(mode))
> + mask |= CEPH_CAP_FILE_SHARED;
> + }
I think I'm going to make a small change here and make this not set the
Ls bit on directories. There really is no need for it since only care
about i_subdirs, and that might prevent having to do a synchronous call
to the MDS.
>
>
>
>
> if (want & (STATX_ATIME|STATX_MTIME|STATX_CTIME|STATX_SIZE|
> STATX_BLOCKS))
> @@ -2377,7 +2384,7 @@ int ceph_getattr(const struct path *path, struct kstat *stat,
>
>
>
>
> /* Skip the getattr altogether if we're asked not to sync */
> if (!(flags & AT_STATX_DONT_SYNC)) {
> - err = ceph_do_getattr(inode, statx_to_caps(request_mask),
> + err = ceph_do_getattr(inode, statx_to_caps(request_mask, inode->i_mode),
> flags & AT_STATX_FORCE_SYNC);
> if (err)
> return err;
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-10 15:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 12:03 [PATCH] ceph: ensure we have Fs caps when fetching dir link count Jeff Layton
2020-11-10 15:38 ` Jeff Layton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).