Commit 735c907d authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

ovl: fix out of date comment and unreachable code 



ovl_inode_update() is no longer called from create object code path.

Fixes: 01b39dcc ("ovl: use inode_insert5() to hash a newly...")
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 300b124f

fs/overlayfs/inode.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

fs/overlayfs/util.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE