diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 14:19:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 14:19:34 -0700 |
commit | 4ae004a9bca8bef118c2b4e76ee31c7df4514f18 (patch) | |
tree | aa314676f64217c11ea68b5b91706d3a5c671e9f /fs/overlayfs/dir.c | |
parent | b910f6a7ccab60b4d930b438a97a265bb2b33135 (diff) | |
parent | 6dde1e42f497b2d4e22466f23019016775607947 (diff) | |
download | linux-4ae004a9bca8bef118c2b4e76ee31c7df4514f18.tar.bz2 |
Merge tag 'ovl-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull overlayfs fixes from Miklos Szeredi:
"Fix two regressions in this cycle, and a couple of older bugs"
* tag 'ovl-fixes-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
ovl: make i_ino consistent with st_ino in more cases
ovl: fix typo in MODULE_PARM_DESC
ovl: fix bogus -Wmaybe-unitialized warning
ovl: don't fail with disconnected lower NFS
ovl: fix wrong flags check in FS_IOC_FS[SG]ETXATTR ioctls
Diffstat (limited to 'fs/overlayfs/dir.c')
-rw-r--r-- | fs/overlayfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 93872bb50230..2f39046ebfa4 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -21,7 +21,7 @@ static unsigned short ovl_redirect_max = 256; module_param_named(redirect_max, ovl_redirect_max, ushort, 0644); -MODULE_PARM_DESC(ovl_redirect_max, +MODULE_PARM_DESC(redirect_max, "Maximum length of absolute redirect xattr value"); static int ovl_set_redirect(struct dentry *dentry, bool samedir); |