diff options
author | David Howells <dhowells@redhat.com> | 2015-03-17 18:25:59 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-15 15:06:57 -0400 |
commit | 2b0143b5c986be1ce8408b3aadc4709e0a94429d (patch) | |
tree | 98b1dee70f3d5d9ac9309f4638e41864ddcd0952 /fs/nfs/nfs3proc.c | |
parent | ce0b16ddf18df35026164fda4a642ef10c01f442 (diff) |
VFS: normal filesystems (and lustre): d_inode() annotations
that's the bulk of filesystem drivers dealing with inodes of their own
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/nfs3proc.c')
-rw-r--r-- | fs/nfs/nfs3proc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 1f11d2533ee4..cb28cceefebe 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -120,7 +120,7 @@ static int | |||
120 | nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, | 120 | nfs3_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, |
121 | struct iattr *sattr) | 121 | struct iattr *sattr) |
122 | { | 122 | { |
123 | struct inode *inode = dentry->d_inode; | 123 | struct inode *inode = d_inode(dentry); |
124 | struct nfs3_sattrargs arg = { | 124 | struct nfs3_sattrargs arg = { |
125 | .fh = NFS_FH(inode), | 125 | .fh = NFS_FH(inode), |
126 | .sattr = sattr, | 126 | .sattr = sattr, |
@@ -386,13 +386,13 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
386 | * not sure this buys us anything (and I'd have | 386 | * not sure this buys us anything (and I'd have |
387 | * to revamp the NFSv3 XDR code) */ | 387 | * to revamp the NFSv3 XDR code) */ |
388 | status = nfs3_proc_setattr(dentry, data->res.fattr, sattr); | 388 | status = nfs3_proc_setattr(dentry, data->res.fattr, sattr); |
389 | nfs_post_op_update_inode(dentry->d_inode, data->res.fattr); | 389 | nfs_post_op_update_inode(d_inode(dentry), data->res.fattr); |
390 | dprintk("NFS reply setattr (post-create): %d\n", status); | 390 | dprintk("NFS reply setattr (post-create): %d\n", status); |
391 | if (status != 0) | 391 | if (status != 0) |
392 | goto out_release_acls; | 392 | goto out_release_acls; |
393 | } | 393 | } |
394 | 394 | ||
395 | status = nfs3_proc_setacls(dentry->d_inode, acl, default_acl); | 395 | status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl); |
396 | 396 | ||
397 | out_release_acls: | 397 | out_release_acls: |
398 | posix_acl_release(acl); | 398 | posix_acl_release(acl); |
@@ -570,7 +570,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) | |||
570 | if (status != 0) | 570 | if (status != 0) |
571 | goto out_release_acls; | 571 | goto out_release_acls; |
572 | 572 | ||
573 | status = nfs3_proc_setacls(dentry->d_inode, acl, default_acl); | 573 | status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl); |
574 | 574 | ||
575 | out_release_acls: | 575 | out_release_acls: |
576 | posix_acl_release(acl); | 576 | posix_acl_release(acl); |
@@ -623,7 +623,7 @@ static int | |||
623 | nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, | 623 | nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, |
624 | u64 cookie, struct page **pages, unsigned int count, int plus) | 624 | u64 cookie, struct page **pages, unsigned int count, int plus) |
625 | { | 625 | { |
626 | struct inode *dir = dentry->d_inode; | 626 | struct inode *dir = d_inode(dentry); |
627 | __be32 *verf = NFS_I(dir)->cookieverf; | 627 | __be32 *verf = NFS_I(dir)->cookieverf; |
628 | struct nfs3_readdirargs arg = { | 628 | struct nfs3_readdirargs arg = { |
629 | .fh = NFS_FH(dir), | 629 | .fh = NFS_FH(dir), |
@@ -715,7 +715,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
715 | if (status != 0) | 715 | if (status != 0) |
716 | goto out_release_acls; | 716 | goto out_release_acls; |
717 | 717 | ||
718 | status = nfs3_proc_setacls(dentry->d_inode, acl, default_acl); | 718 | status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl); |
719 | 719 | ||
720 | out_release_acls: | 720 | out_release_acls: |
721 | posix_acl_release(acl); | 721 | posix_acl_release(acl); |