diff options
| author |   Amir Goldstein <amir73il@gmail.com> | 2019-11-19 17:14:55 +0200 |
|---|---|---|
| committer |   Miklos Szeredi <mszeredi@redhat.com> | 2020-03-17 15:04:21 +0100 |
| commit | 735c907d7b7df501e951ba07134b9f6f989a94e4 (patch) | |
| tree | c4ef2f380cc46367371a3251daebaf0fcf058e51 /fs/overlayfs | |
| parent | ovl: fix value of i_ino for lower hardlink corner case (diff) | |
| download | wireguard-linux-735c907d7b7df501e951ba07134b9f6f989a94e4.tar.xz wireguard-linux-735c907d7b7df501e951ba07134b9f6f989a94e4.zip | |
ovl: fix out of date comment and unreachable code
ovl_inode_update() is no longer called from create object code path.
Fixes: 01b39dcc9568 ("ovl: use inode_insert5() to hash a newly...")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs')
| -rw-r--r-- | fs/overlayfs/inode.c | 8 | ||||
| -rw-r--r-- | fs/overlayfs/util.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 3f993c114829..98a605b54e2d 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -571,9 +571,11 @@ static void ovl_fill_inode(struct inode *inode, umode_t mode, dev_t rdev, * bits to encode layer), set the same value used for st_ino to i_ino, * so inode number exposed via /proc/locks and a like will be * consistent with d_ino and st_ino values. An i_ino value inconsistent - * with d_ino also causes nfsd readdirplus to fail. When called from - * ovl_new_inode(), ino arg is 0, so i_ino will be updated to real - * upper inode i_ino on ovl_inode_init() or ovl_inode_update(). + * with d_ino also causes nfsd readdirplus to fail. + * + * When called from ovl_create_object() => ovl_new_inode(), with + * ino = 0, i_ino will be updated to consistent value later on in + * ovl_get_inode() => ovl_fill_inode(). */ if (ovl_same_dev(inode->i_sb)) { inode->i_ino = ino; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 042f7eb4f7f4..6584e5800a59 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -416,8 +416,6 @@ void ovl_inode_update(struct inode *inode, struct dentry *upperdentry) smp_wmb(); OVL_I(inode)->__upperdentry = upperdentry; if (inode_unhashed(inode)) { - if (!inode->i_ino) - inode->i_ino = upperinode->i_ino; inode->i_private = upperinode; __insert_inode_hash(inode, (unsigned long) upperinode); } |