Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f24928d authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: use new getattr in inode getattr and permission 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent e2f7f0d7

fs/orangefs/inode.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -268,8 +268,7 @@ int orangefs_getattr(struct vfsmount *mnt, 
		     "orangefs_getattr: called on %s\n",

		     "orangefs_getattr: called on %s\n",

		     dentry->d_name.name);

		     dentry->d_name.name);





	ret = orangefs_inode_old_getattr(inode, ORANGEFS_ATTR_SYS_ALL_NOHINT,

	ret = orangefs_inode_getattr(inode, 0, 1);

	    0);

	if (ret == 0) {

	if (ret == 0) {

		generic_fillattr(inode, kstat);

		generic_fillattr(inode, kstat);
@@ -278,14 +277,6 @@ int orangefs_getattr(struct vfsmount *mnt, 
		kstat->blksize = orangefs_inode->blksize;

		kstat->blksize = orangefs_inode->blksize;





		inode->i_link = ORANGEFS_I(dentry->d_inode)->link_target;

		inode->i_link = ORANGEFS_I(dentry->d_inode)->link_target;

	} else {

		/* assume an I/O error and flag inode as bad */

		gossip_debug(GOSSIP_INODE_DEBUG,

			     "%s:%s:%d calling make bad inode\n",

			     __FILE__,

			     __func__,

			     __LINE__);

		orangefs_make_bad_inode(inode);

	}

	}

	return ret;

	return ret;

}

}
@@ -300,8 +291,7 @@ int orangefs_permission(struct inode *inode, int mask) 
	gossip_debug(GOSSIP_INODE_DEBUG, "%s: refreshing\n", __func__);

	gossip_debug(GOSSIP_INODE_DEBUG, "%s: refreshing\n", __func__);





	/* Make sure the permission (and other common attrs) are up to date. */

	/* Make sure the permission (and other common attrs) are up to date. */

	ret = orangefs_inode_old_getattr(inode,

	ret = orangefs_inode_getattr(inode, 0, 0);

	    ORANGEFS_ATTR_SYS_ALL_NOHINT_NOSIZE, 0);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;