History

NFS: Remove the nfs4_label argument from nfs_fhget()

Anna Schumaker committed 5 years ago

Commit cf7ab001 parent cc6f3297 files · +11 −12Browse files

Unified · Split

7 files
  1. fs/nfs/dir.c +3 −3
  2. fs/nfs/export.c +2 −2
  3. fs/nfs/getroot.c +1 −1
  4. fs/nfs/inode.c +2 −2
  5. fs/nfs/nfs4file.c +1 −2
  6. fs/nfs/nfs4proc.c +1 −1
  7. include/linux/nfs_fs.h +1 −1
fs/nfs/dir.c+3−3
@@ -697,7 +697,7 @@ again: · 696 unmodified lines
697 goto out;697 goto out;
698 }698 }
699 699
700 inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr, entry->fattr->label);700 inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
701 alias = d_splice_alias(inode, dentry);701 alias = d_splice_alias(inode, dentry);
702 d_lookup_done(dentry);702 d_lookup_done(dentry);
703 if (alias) {703 if (alias) {
@@ -1782,7 +1782,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in · 1078 unmodified lines
1782 res = ERR_PTR(error);1782 res = ERR_PTR(error);
1783 goto out;1783 goto out;
1784 }1784 }
1785 inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);1785 inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
1786 res = ERR_CAST(inode);1786 res = ERR_CAST(inode);
1787 if (IS_ERR(res))1787 if (IS_ERR(res))
1788 goto out;1788 goto out;
@@ -2059,7 +2059,7 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle, · 270 unmodified lines
2059 if (error < 0)2059 if (error < 0)
2060 goto out_error;2060 goto out_error;
2061 }2061 }
2062 inode = nfs_fhget(dentry->d_sb, fhandle, fattr, fattr->label);2062 inode = nfs_fhget(dentry->d_sb, fhandle, fattr);
2063 d = d_splice_alias(inode, dentry);2063 d = d_splice_alias(inode, dentry);
2064out:2064out:
2065 dput(parent);2065 dput(parent);
fs/nfs/export.c+2−2
@@ -103,7 +103,7 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, · 102 unmodified lines
103 goto out_free_fattr;103 goto out_free_fattr;
104 }104 }
105 105
106 inode = nfs_fhget(sb, server_fh, fattr, fattr->label);106 inode = nfs_fhget(sb, server_fh, fattr);
107 107
108out_found:108out_found:
109 dentry = d_obtain_alias(inode);109 dentry = d_obtain_alias(inode);
@@ -138,7 +138,7 @@ nfs_get_parent(struct dentry *dentry) · 28 unmodified lines
138 goto out;138 goto out;
139 }139 }
140 140
141 pinode = nfs_fhget(sb, &fh, fattr, fattr->label);141 pinode = nfs_fhget(sb, &fh, fattr);
142 parent = d_obtain_alias(pinode);142 parent = d_obtain_alias(pinode);
143out:143out:
144 nfs_free_fattr(fattr);144 nfs_free_fattr(fattr);
fs/nfs/getroot.c+1−1
@@ -91,7 +91,7 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc) · 90 unmodified lines
91 goto out_fattr;91 goto out_fattr;
92 }92 }
93 93
94 inode = nfs_fhget(s, ctx->mntfh, fsinfo.fattr, NULL);94 inode = nfs_fhget(s, ctx->mntfh, fsinfo.fattr);
95 if (IS_ERR(inode)) {95 if (IS_ERR(inode)) {
96 dprintk("nfs_get_root: get root inode failed\n");96 dprintk("nfs_get_root: get root inode failed\n");
97 error = PTR_ERR(inode);97 error = PTR_ERR(inode);
fs/nfs/inode.c+2−2
@@ -448,7 +448,7 @@ static void nfs_inode_init_dir(struct nfs_inode *nfsi) · 447 unmodified lines
448 * instead of inode number.448 * instead of inode number.
449 */449 */
450struct inode *450struct inode *
451nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, struct nfs4_label *label)451nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
452{452{
453 struct nfs_find_desc desc = {453 struct nfs_find_desc desc = {
454 .fh = fh,454 .fh = fh,
@@ -581,7 +581,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st · 126 unmodified lines
581 fattr->size != 0)581 fattr->size != 0)
582 nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);582 nfs_set_cache_invalid(inode, NFS_INO_INVALID_BLOCKS);
583 583
584 nfs_setsecurity(inode, fattr, label);584 nfs_setsecurity(inode, fattr, fattr->label);
585 585
586 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);586 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
587 nfsi->attrtimeo_timestamp = now;587 nfsi->attrtimeo_timestamp = now;
fs/nfs/nfs4file.c+1−2
@@ -344,8 +344,7 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, · 343 unmodified lines
344 goto out;344 goto out;
345 snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++);345 snprintf(read_name, len, SSC_READ_NAME_BODY, read_name_gen++);
346 346
347 r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr,347 r_ino = nfs_fhget(ss_mnt->mnt_root->d_inode->i_sb, src_fh, fattr);
348 NULL);
349 if (IS_ERR(r_ino)) {348 if (IS_ERR(r_ino)) {
350 res = ERR_CAST(r_ino);349 res = ERR_CAST(r_ino);
351 goto out_free_name;350 goto out_free_name;
fs/nfs/nfs4proc.c+1−1
@@ -2008,7 +2008,7 @@ nfs4_opendata_get_inode(struct nfs4_opendata *data) · 2007 unmodified lines
2008 if (!(data->f_attr.valid & NFS_ATTR_FATTR))2008 if (!(data->f_attr.valid & NFS_ATTR_FATTR))
2009 return ERR_PTR(-EAGAIN);2009 return ERR_PTR(-EAGAIN);
2010 inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh,2010 inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh,
2011 &data->f_attr, data->f_attr.label);2011 &data->f_attr);
2012 break;2012 break;
2013 default:2013 default:
2014 inode = d_inode(data->dentry);2014 inode = d_inode(data->dentry);
include/linux/nfs_fs.h+1−1
@@ -388,7 +388,7 @@ extern void nfs_zap_caches(struct inode *); · 387 unmodified lines
388extern void nfs_set_inode_stale(struct inode *inode);388extern void nfs_set_inode_stale(struct inode *inode);
389extern void nfs_invalidate_atime(struct inode *);389extern void nfs_invalidate_atime(struct inode *);
390extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,390extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
391 struct nfs_fattr *, struct nfs4_label *);391 struct nfs_fattr *);
392struct inode *nfs_ilookup(struct super_block *sb, struct nfs_fattr *, struct nfs_fh *);392struct inode *nfs_ilookup(struct super_block *sb, struct nfs_fattr *, struct nfs_fh *);
393extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);393extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
394extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);394extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t