diff options
| author | David Howells <dhowells@redhat.com> | 2011-01-14 18:45:42 +0000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-15 20:07:34 -0500 |
| commit | 36d43a43761b004ad1879ac21471d8fc5f3157ec (patch) | |
| tree | 6cb6c6d978f4e58de7f9bf901707d6929f098345 /fs/nfs/inode.c | |
| parent | d18610b0ce9eb48c60649d8fcbf68374c84349d3 (diff) | |
| download | op-kernel-dev-36d43a43761b004ad1879ac21471d8fc5f3157ec.zip op-kernel-dev-36d43a43761b004ad1879ac21471d8fc5f3157ec.tar.gz | |
NFS: Use d_automount() rather than abusing follow_link()
Make NFS use the new d_automount() dentry operation rather than abusing
follow_link() on directories.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index ce00b70..d851242 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -300,7 +300,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) else inode->i_op = &nfs_mountpoint_inode_operations; inode->i_fop = NULL; - set_bit(NFS_INO_MOUNTPOINT, &nfsi->flags); + inode->i_flags |= S_AUTOMOUNT; } } else if (S_ISLNK(inode->i_mode)) inode->i_op = &nfs_symlink_inode_operations; @@ -1208,7 +1208,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) /* Update the fsid? */ if (S_ISDIR(inode->i_mode) && (fattr->valid & NFS_ATTR_FATTR_FSID) && !nfs_fsid_equal(&server->fsid, &fattr->fsid) && - !test_bit(NFS_INO_MOUNTPOINT, &nfsi->flags)) + !IS_AUTOMOUNT(inode)) server->fsid = fattr->fsid; /* |
