[PATCH 14/23] nfs_clone_sb_security(): simplify the check for server bogosity

From: David Howells
Date: Thu May 23 2019 - 12:20:49 EST


From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

We used to check ->i_op for being nfs_dir_inode_operations. With
separate inode_operations for v3 and v4 that became bogus, but
rather than going for protocol-dependent comparison we could've
just checked ->i_fop instead; _that_ is the same for all protocol
versions.

Reviewed-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---

fs/nfs/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index dd379898ab23..a78f409e7634 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2546,7 +2546,7 @@ int nfs_clone_sb_security(struct super_block *s, struct dentry *mntroot,
unsigned long kflags = 0, kflags_out = 0;

/* clone any lsm security options from the parent to the new sb */
- if (d_inode(mntroot)->i_op != NFS_SB(s)->nfs_client->rpc_ops->dir_inode_ops)
+ if (d_inode(mntroot)->i_fop != &nfs_dir_operations)
return -ESTALE;

if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)