diff options
| author | Luis Henriques <lhenriques@suse.com> | 2018-05-21 10:27:29 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2018-06-04 20:45:56 +0200 |
| commit | 8c6286f1c69743ebdb2ee15f9165f9c4d44eef49 (patch) | |
| tree | 12d125d8946dbdbb57ad41847d397ebe00d0a0c6 /fs | |
| parent | 597817ddbbf27af5986d1f3df20390b2738411c6 (diff) | |
| download | linux-stable-8c6286f1c69743ebdb2ee15f9165f9c4d44eef49.tar.gz linux-stable-8c6286f1c69743ebdb2ee15f9165f9c4d44eef49.tar.bz2 linux-stable-8c6286f1c69743ebdb2ee15f9165f9c4d44eef49.zip | |
ceph: fix st_nlink stat for directories
Currently, calling stat on a cephfs directory returns 1 for st_nlink.
This behaviour has recently changed in the fuse client, as some
applications seem to expect this value to be either 0 (if it's
unlinked) or 2 + number of subdirectories. This behaviour was changed
in the fuse client with commit 67c7e4619188 ("client: use common
interp of st_nlink for dirs").
This patch modifies the kernel client to have a similar behaviour.
Link: https://tracker.ceph.com/issues/23873
Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/inode.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 4712c943cdf7..4aeccb13437b 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -2271,6 +2271,14 @@ int ceph_getattr(const struct path *path, struct kstat *stat, stat->size = ci->i_files + ci->i_subdirs; stat->blocks = 0; stat->blksize = 65536; + /* + * Some applications rely on the number of st_nlink + * value on directories to be either 0 (if unlinked) + * or 2 + number of subdirectories. + */ + if (stat->nlink == 1) + /* '.' + '..' + subdirs */ + stat->nlink = 1 + 1 + ci->i_subdirs; } } return err; |