NFS: Remove the nfs4_label argument from nfs_instantiate()

[sfrench/cifs-2.6.git] / fs / nfs / dir.c

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index aa95a898ad0fec753254bee76cd6cfcdb1ba833b..48ea69af94466bc91555d5341a4a838c23d2b302 100644 (file)
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2075,12 +2075,11 @@ EXPORT_SYMBOL_GPL(nfs_add_or_obtain);
  * Code common to create, mkdir, and mknod.
  */
 int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,
-                               struct nfs_fattr *fattr,
-                               struct nfs4_label *label)
+                               struct nfs_fattr *fattr)
 {
        struct dentry *d;
 
-       d = nfs_add_or_obtain(dentry, fhandle, fattr, label);
+       d = nfs_add_or_obtain(dentry, fhandle, fattr, fattr->label);
        if (IS_ERR(d))
                return PTR_ERR(d);