diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 02:13:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 02:13:18 +0200 |
| commit | 7a3353c5c441175582cf0d17f855b2ffd83fb9db (patch) | |
| tree | e19ee5ba7a4062636ac765c97dbe7ba15daf1ca9 /fs/gfs2 | |
| parent | Merge tag 'pull-d_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro... (diff) | |
| parent | dma_buf_getfile(): don't bother with ->f_flags reassignments (diff) | |
| download | linux-7a3353c5c441175582cf0d17f855b2ffd83fb9db.tar.xz linux-7a3353c5c441175582cf0d17f855b2ffd83fb9db.zip | |
Merge tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs file updates from Al Viro:
"struct file-related stuff"
* tag 'pull-file' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
dma_buf_getfile(): don't bother with ->f_flags reassignments
Change calling conventions for filldir_t
locks: fix TOCTOU race when granting write lease
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/export.c b/fs/gfs2/export.c index 756d05779200..cf40895233f5 100644 --- a/fs/gfs2/export.c +++ b/fs/gfs2/export.c @@ -66,7 +66,7 @@ struct get_name_filldir { char *name; }; -static int get_name_filldir(struct dir_context *ctx, const char *name, +static bool get_name_filldir(struct dir_context *ctx, const char *name, int length, loff_t offset, u64 inum, unsigned int type) { @@ -74,12 +74,12 @@ static int get_name_filldir(struct dir_context *ctx, const char *name, container_of(ctx, struct get_name_filldir, ctx); if (inum != gnfd->inum.no_addr) - return 0; + return true; memcpy(gnfd->name, name, length); gnfd->name[length] = 0; - return 1; + return false; } static int gfs2_get_name(struct dentry *parent, char *name, |