diff options
author | David Quigley <dpquigl@davequigley.com> | 2013-05-22 12:50:42 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-06-08 16:20:15 -0400 |
commit | 1775fd3e805b6a852ef376256967de69284d7962 (patch) | |
tree | fdb649dd62e526e65b8ac1868a2a4456b81fc150 /fs/nfs/inode.c | |
parent | a09df2ca2313fd49f0f3e1f2caa546bcacf7b6df (diff) |
NFS:Add labels to client function prototypes
After looking at all of the nfsv4 operations the label structure has been added
to the prototypes of the functions which can transmit label data.
Signed-off-by: Matthew N. Dodd <Matthew.Dodd@sparta.com>
Signed-off-by: Miguel Rodel Felipe <Rodel_FM@dsi.a-star.edu.sg>
Signed-off-by: Phua Eu Gene <PHUA_Eu_Gene@dsi.a-star.edu.sg>
Signed-off-by: Khin Mi Mi Aung <Mi_Mi_AUNG@dsi.a-star.edu.sg>
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r-- | fs/nfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 07fcf0b90669..58e7bf876e6c 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(nfs4_label_alloc); | |||
290 | * instead of inode number. | 290 | * instead of inode number. |
291 | */ | 291 | */ |
292 | struct inode * | 292 | struct inode * |
293 | nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) | 293 | nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, struct nfs4_label *label) |
294 | { | 294 | { |
295 | struct nfs_find_desc desc = { | 295 | struct nfs_find_desc desc = { |
296 | .fh = fh, | 296 | .fh = fh, |
@@ -818,6 +818,7 @@ int | |||
818 | __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | 818 | __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) |
819 | { | 819 | { |
820 | int status = -ESTALE; | 820 | int status = -ESTALE; |
821 | struct nfs4_label *label = NULL; | ||
821 | struct nfs_fattr *fattr = NULL; | 822 | struct nfs_fattr *fattr = NULL; |
822 | struct nfs_inode *nfsi = NFS_I(inode); | 823 | struct nfs_inode *nfsi = NFS_I(inode); |
823 | 824 | ||
@@ -835,7 +836,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
835 | goto out; | 836 | goto out; |
836 | 837 | ||
837 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); | 838 | nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE); |
838 | status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr); | 839 | status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr, label); |
839 | if (status != 0) { | 840 | if (status != 0) { |
840 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n", | 841 | dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n", |
841 | inode->i_sb->s_id, | 842 | inode->i_sb->s_id, |