diff options
author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-18 13:32:38 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-20 15:14:21 -0500 |
commit | 302fad7bd5c36de0eb4e94db5c15e12c68a9c842 (patch) | |
tree | 134f55331018e3f2211ba5580c40d23e66e3afbc | |
parent | 2dc23afffbcac7c8935422beca1ba8636ff310ad (diff) |
NFS: Fix up documentation warnings
Fix up some compiler warnings about function parameters, etc not being
correctly described or formatted.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
-rw-r--r-- | fs/nfs/delegation.c | 2 | ||||
-rw-r--r-- | fs/nfs/dir.c | 2 | ||||
-rw-r--r-- | fs/nfs/file.c | 4 | ||||
-rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayoutdev.c | 12 | ||||
-rw-r--r-- | fs/nfs/inode.c | 33 | ||||
-rw-r--r-- | fs/nfs/io.c | 12 | ||||
-rw-r--r-- | fs/nfs/namespace.c | 8 | ||||
-rw-r--r-- | fs/nfs/nfs4client.c | 32 | ||||
-rw-r--r-- | fs/nfs/nfs4namespace.c | 5 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 8 | ||||
-rw-r--r-- | fs/nfs/nfs4session.c | 2 | ||||
-rw-r--r-- | fs/nfs/nfs4state.c | 1 | ||||
-rw-r--r-- | fs/nfs/pagelist.c | 7 | ||||
-rw-r--r-- | fs/nfs/unlink.c | 8 | ||||
-rw-r--r-- | fs/nfs/write.c | 1 |
15 files changed, 75 insertions, 62 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 885363ca8569..70e5931f3c60 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -681,7 +681,7 @@ void nfs_expire_all_delegations(struct nfs_client *clp) | |||
681 | 681 | ||
682 | /** | 682 | /** |
683 | * nfs_super_return_all_delegations - return delegations for one superblock | 683 | * nfs_super_return_all_delegations - return delegations for one superblock |
684 | * @sb: sb to process | 684 | * @server: pointer to nfs_server to process |
685 | * | 685 | * |
686 | */ | 686 | */ |
687 | void nfs_server_return_all_delegations(struct nfs_server *server) | 687 | void nfs_server_return_all_delegations(struct nfs_server *server) |
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 6bf4471850c8..0fb37fac88c9 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -945,7 +945,7 @@ static int nfs_fsync_dir(struct file *filp, loff_t start, loff_t end, | |||
945 | 945 | ||
946 | /** | 946 | /** |
947 | * nfs_force_lookup_revalidate - Mark the directory as having changed | 947 | * nfs_force_lookup_revalidate - Mark the directory as having changed |
948 | * @dir - pointer to directory inode | 948 | * @dir: pointer to directory inode |
949 | * | 949 | * |
950 | * This forces the revalidation code in nfs_lookup_revalidate() to do a | 950 | * This forces the revalidation code in nfs_lookup_revalidate() to do a |
951 | * full lookup on all child dentries of 'dir' whenever a change occurs | 951 | * full lookup on all child dentries of 'dir' whenever a change occurs |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 29553fdba8af..e4a33e66f417 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -89,8 +89,8 @@ EXPORT_SYMBOL_GPL(nfs_file_release); | |||
89 | 89 | ||
90 | /** | 90 | /** |
91 | * nfs_revalidate_size - Revalidate the file size | 91 | * nfs_revalidate_size - Revalidate the file size |
92 | * @inode - pointer to inode struct | 92 | * @inode: pointer to inode struct |
93 | * @file - pointer to struct file | 93 | * @filp: pointer to struct file |
94 | * | 94 | * |
95 | * Revalidates the file length. This is basically a wrapper around | 95 | * Revalidates the file length. This is basically a wrapper around |
96 | * nfs_revalidate_inode() that takes into account the fact that we may | 96 | * nfs_revalidate_inode() that takes into account the fact that we may |
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index 11766a74216d..ca7a6203b3cb 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c | |||
@@ -483,9 +483,15 @@ ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg, u32 ds_idx, | |||
483 | } | 483 | } |
484 | 484 | ||
485 | /** | 485 | /** |
486 | * Find or create a DS rpc client with th MDS server rpc client auth flavor | 486 | * nfs4_ff_find_or_create_ds_client - Find or create a DS rpc client |
487 | * in the nfs_client cl_ds_clients list. | 487 | * @lseg: pointer to layout segment |
488 | */ | 488 | * @ds_idx: mirror index |
489 | * @ds_clp: nfs_client for the DS | ||
490 | * @inode: pointer to inode | ||
491 | * | ||
492 | * Find or create a DS rpc client with th MDS server rpc client auth flavor | ||
493 | * in the nfs_client cl_ds_clients list. | ||
494 | */ | ||
489 | struct rpc_clnt * | 495 | struct rpc_clnt * |
490 | nfs4_ff_find_or_create_ds_client(struct pnfs_layout_segment *lseg, u32 ds_idx, | 496 | nfs4_ff_find_or_create_ds_client(struct pnfs_layout_segment *lseg, u32 ds_idx, |
491 | struct nfs_client *ds_clp, struct inode *inode) | 497 | struct nfs_client *ds_clp, struct inode *inode) |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 094775ea0781..414a90d48493 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -143,6 +143,7 @@ EXPORT_SYMBOL_GPL(nfs_sync_inode); | |||
143 | 143 | ||
144 | /** | 144 | /** |
145 | * nfs_sync_mapping - helper to flush all mmapped dirty data to disk | 145 | * nfs_sync_mapping - helper to flush all mmapped dirty data to disk |
146 | * @mapping: pointer to struct address_space | ||
146 | */ | 147 | */ |
147 | int nfs_sync_mapping(struct address_space *mapping) | 148 | int nfs_sync_mapping(struct address_space *mapping) |
148 | { | 149 | { |
@@ -1184,8 +1185,8 @@ int nfs_attribute_cache_expired(struct inode *inode) | |||
1184 | 1185 | ||
1185 | /** | 1186 | /** |
1186 | * nfs_revalidate_inode - Revalidate the inode attributes | 1187 | * nfs_revalidate_inode - Revalidate the inode attributes |
1187 | * @server - pointer to nfs_server struct | 1188 | * @server: pointer to nfs_server struct |
1188 | * @inode - pointer to inode struct | 1189 | * @inode: pointer to inode struct |
1189 | * | 1190 | * |
1190 | * Updates inode attribute information by retrieving the data from the server. | 1191 | * Updates inode attribute information by retrieving the data from the server. |
1191 | */ | 1192 | */ |
@@ -1255,8 +1256,8 @@ out: | |||
1255 | 1256 | ||
1256 | /** | 1257 | /** |
1257 | * nfs_revalidate_mapping - Revalidate the pagecache | 1258 | * nfs_revalidate_mapping - Revalidate the pagecache |
1258 | * @inode - pointer to host inode | 1259 | * @inode: pointer to host inode |
1259 | * @mapping - pointer to mapping | 1260 | * @mapping: pointer to mapping |
1260 | */ | 1261 | */ |
1261 | int nfs_revalidate_mapping(struct inode *inode, | 1262 | int nfs_revalidate_mapping(struct inode *inode, |
1262 | struct address_space *mapping) | 1263 | struct address_space *mapping) |
@@ -1371,8 +1372,8 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
1371 | 1372 | ||
1372 | /** | 1373 | /** |
1373 | * nfs_check_inode_attributes - verify consistency of the inode attribute cache | 1374 | * nfs_check_inode_attributes - verify consistency of the inode attribute cache |
1374 | * @inode - pointer to inode | 1375 | * @inode: pointer to inode |
1375 | * @fattr - updated attributes | 1376 | * @fattr: updated attributes |
1376 | * | 1377 | * |
1377 | * Verifies the attribute cache. If we have just changed the attributes, | 1378 | * Verifies the attribute cache. If we have just changed the attributes, |
1378 | * so that fattr carries weak cache consistency data, then it may | 1379 | * so that fattr carries weak cache consistency data, then it may |
@@ -1572,8 +1573,8 @@ EXPORT_SYMBOL_GPL(_nfs_display_fhandle); | |||
1572 | 1573 | ||
1573 | /** | 1574 | /** |
1574 | * nfs_inode_attrs_need_update - check if the inode attributes need updating | 1575 | * nfs_inode_attrs_need_update - check if the inode attributes need updating |
1575 | * @inode - pointer to inode | 1576 | * @inode: pointer to inode |
1576 | * @fattr - attributes | 1577 | * @fattr: attributes |
1577 | * | 1578 | * |
1578 | * Attempt to divine whether or not an RPC call reply carrying stale | 1579 | * Attempt to divine whether or not an RPC call reply carrying stale |
1579 | * attributes got scheduled after another call carrying updated ones. | 1580 | * attributes got scheduled after another call carrying updated ones. |
@@ -1614,8 +1615,8 @@ static int nfs_refresh_inode_locked(struct inode *inode, struct nfs_fattr *fattr | |||
1614 | 1615 | ||
1615 | /** | 1616 | /** |
1616 | * nfs_refresh_inode - try to update the inode attribute cache | 1617 | * nfs_refresh_inode - try to update the inode attribute cache |
1617 | * @inode - pointer to inode | 1618 | * @inode: pointer to inode |
1618 | * @fattr - updated attributes | 1619 | * @fattr: updated attributes |
1619 | * | 1620 | * |
1620 | * Check that an RPC call that returned attributes has not overlapped with | 1621 | * Check that an RPC call that returned attributes has not overlapped with |
1621 | * other recent updates of the inode metadata, then decide whether it is | 1622 | * other recent updates of the inode metadata, then decide whether it is |
@@ -1649,8 +1650,8 @@ static int nfs_post_op_update_inode_locked(struct inode *inode, | |||
1649 | 1650 | ||
1650 | /** | 1651 | /** |
1651 | * nfs_post_op_update_inode - try to update the inode attribute cache | 1652 | * nfs_post_op_update_inode - try to update the inode attribute cache |
1652 | * @inode - pointer to inode | 1653 | * @inode: pointer to inode |
1653 | * @fattr - updated attributes | 1654 | * @fattr: updated attributes |
1654 | * | 1655 | * |
1655 | * After an operation that has changed the inode metadata, mark the | 1656 | * After an operation that has changed the inode metadata, mark the |
1656 | * attribute cache as being invalid, then try to update it. | 1657 | * attribute cache as being invalid, then try to update it. |
@@ -1679,8 +1680,8 @@ EXPORT_SYMBOL_GPL(nfs_post_op_update_inode); | |||
1679 | 1680 | ||
1680 | /** | 1681 | /** |
1681 | * nfs_post_op_update_inode_force_wcc_locked - update the inode attribute cache | 1682 | * nfs_post_op_update_inode_force_wcc_locked - update the inode attribute cache |
1682 | * @inode - pointer to inode | 1683 | * @inode: pointer to inode |
1683 | * @fattr - updated attributes | 1684 | * @fattr: updated attributes |
1684 | * | 1685 | * |
1685 | * After an operation that has changed the inode metadata, mark the | 1686 | * After an operation that has changed the inode metadata, mark the |
1686 | * attribute cache as being invalid, then try to update it. Fake up | 1687 | * attribute cache as being invalid, then try to update it. Fake up |
@@ -1731,8 +1732,8 @@ out_noforce: | |||
1731 | 1732 | ||
1732 | /** | 1733 | /** |
1733 | * nfs_post_op_update_inode_force_wcc - try to update the inode attribute cache | 1734 | * nfs_post_op_update_inode_force_wcc - try to update the inode attribute cache |
1734 | * @inode - pointer to inode | 1735 | * @inode: pointer to inode |
1735 | * @fattr - updated attributes | 1736 | * @fattr: updated attributes |
1736 | * | 1737 | * |
1737 | * After an operation that has changed the inode metadata, mark the | 1738 | * After an operation that has changed the inode metadata, mark the |
1738 | * attribute cache as being invalid, then try to update it. Fake up | 1739 | * attribute cache as being invalid, then try to update it. Fake up |
diff --git a/fs/nfs/io.c b/fs/nfs/io.c index 9034b4926909..5088fda9b453 100644 --- a/fs/nfs/io.c +++ b/fs/nfs/io.c | |||
@@ -25,7 +25,7 @@ static void nfs_block_o_direct(struct nfs_inode *nfsi, struct inode *inode) | |||
25 | 25 | ||
26 | /** | 26 | /** |
27 | * nfs_start_io_read - declare the file is being used for buffered reads | 27 | * nfs_start_io_read - declare the file is being used for buffered reads |
28 | * @inode - file inode | 28 | * @inode: file inode |
29 | * | 29 | * |
30 | * Declare that a buffered read operation is about to start, and ensure | 30 | * Declare that a buffered read operation is about to start, and ensure |
31 | * that we block all direct I/O. | 31 | * that we block all direct I/O. |
@@ -56,7 +56,7 @@ nfs_start_io_read(struct inode *inode) | |||
56 | 56 | ||
57 | /** | 57 | /** |
58 | * nfs_end_io_read - declare that the buffered read operation is done | 58 | * nfs_end_io_read - declare that the buffered read operation is done |
59 | * @inode - file inode | 59 | * @inode: file inode |
60 | * | 60 | * |
61 | * Declare that a buffered read operation is done, and release the shared | 61 | * Declare that a buffered read operation is done, and release the shared |
62 | * lock on inode->i_rwsem. | 62 | * lock on inode->i_rwsem. |
@@ -69,7 +69,7 @@ nfs_end_io_read(struct inode *inode) | |||
69 | 69 | ||
70 | /** | 70 | /** |
71 | * nfs_start_io_write - declare the file is being used for buffered writes | 71 | * nfs_start_io_write - declare the file is being used for buffered writes |
72 | * @inode - file inode | 72 | * @inode: file inode |
73 | * | 73 | * |
74 | * Declare that a buffered read operation is about to start, and ensure | 74 | * Declare that a buffered read operation is about to start, and ensure |
75 | * that we block all direct I/O. | 75 | * that we block all direct I/O. |
@@ -83,7 +83,7 @@ nfs_start_io_write(struct inode *inode) | |||
83 | 83 | ||
84 | /** | 84 | /** |
85 | * nfs_end_io_write - declare that the buffered write operation is done | 85 | * nfs_end_io_write - declare that the buffered write operation is done |
86 | * @inode - file inode | 86 | * @inode: file inode |
87 | * | 87 | * |
88 | * Declare that a buffered write operation is done, and release the | 88 | * Declare that a buffered write operation is done, and release the |
89 | * lock on inode->i_rwsem. | 89 | * lock on inode->i_rwsem. |
@@ -105,7 +105,7 @@ static void nfs_block_buffered(struct nfs_inode *nfsi, struct inode *inode) | |||
105 | 105 | ||
106 | /** | 106 | /** |
107 | * nfs_end_io_direct - declare the file is being used for direct i/o | 107 | * nfs_end_io_direct - declare the file is being used for direct i/o |
108 | * @inode - file inode | 108 | * @inode: file inode |
109 | * | 109 | * |
110 | * Declare that a direct I/O operation is about to start, and ensure | 110 | * Declare that a direct I/O operation is about to start, and ensure |
111 | * that we block all buffered I/O. | 111 | * that we block all buffered I/O. |
@@ -136,7 +136,7 @@ nfs_start_io_direct(struct inode *inode) | |||
136 | 136 | ||
137 | /** | 137 | /** |
138 | * nfs_end_io_direct - declare that the direct i/o operation is done | 138 | * nfs_end_io_direct - declare that the direct i/o operation is done |
139 | * @inode - file inode | 139 | * @inode: file inode |
140 | * | 140 | * |
141 | * Declare that a direct I/O operation is done, and release the shared | 141 | * Declare that a direct I/O operation is done, and release the shared |
142 | * lock on inode->i_rwsem. | 142 | * lock on inode->i_rwsem. |
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index e5686be67be8..15f099a24c29 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c | |||
@@ -221,10 +221,10 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, | |||
221 | 221 | ||
222 | /** | 222 | /** |
223 | * nfs_do_submount - set up mountpoint when crossing a filesystem boundary | 223 | * nfs_do_submount - set up mountpoint when crossing a filesystem boundary |
224 | * @dentry - parent directory | 224 | * @dentry: parent directory |
225 | * @fh - filehandle for new root dentry | 225 | * @fh: filehandle for new root dentry |
226 | * @fattr - attributes for new root inode | 226 | * @fattr: attributes for new root inode |
227 | * @authflavor - security flavor to use when performing the mount | 227 | * @authflavor: security flavor to use when performing the mount |
228 | * | 228 | * |
229 | */ | 229 | */ |
230 | struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, | 230 | struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, |
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 2548405da1f7..170115fc43c5 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c | |||
@@ -42,7 +42,7 @@ static int nfs_get_cb_ident_idr(struct nfs_client *clp, int minorversion) | |||
42 | } | 42 | } |
43 | 43 | ||
44 | #ifdef CONFIG_NFS_V4_1 | 44 | #ifdef CONFIG_NFS_V4_1 |
45 | /** | 45 | /* |
46 | * Per auth flavor data server rpc clients | 46 | * Per auth flavor data server rpc clients |
47 | */ | 47 | */ |
48 | struct nfs4_ds_server { | 48 | struct nfs4_ds_server { |
@@ -51,7 +51,9 @@ struct nfs4_ds_server { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Common lookup case for DS I/O | 54 | * nfs4_find_ds_client - Common lookup case for DS I/O |
55 | * @ds_clp: pointer to the DS's nfs_client | ||
56 | * @flavor: rpc auth flavour to match | ||
55 | */ | 57 | */ |
56 | static struct nfs4_ds_server * | 58 | static struct nfs4_ds_server * |
57 | nfs4_find_ds_client(struct nfs_client *ds_clp, rpc_authflavor_t flavor) | 59 | nfs4_find_ds_client(struct nfs_client *ds_clp, rpc_authflavor_t flavor) |
@@ -118,9 +120,13 @@ nfs4_free_ds_server(struct nfs4_ds_server *dss) | |||
118 | } | 120 | } |
119 | 121 | ||
120 | /** | 122 | /** |
121 | * Find or create a DS rpc client with th MDS server rpc client auth flavor | 123 | * nfs4_find_or_create_ds_client - Find or create a DS rpc client |
122 | * in the nfs_client cl_ds_clients list. | 124 | * @ds_clp: pointer to the DS's nfs_client |
123 | */ | 125 | * @inode: pointer to the inode |
126 | * | ||
127 | * Find or create a DS rpc client with th MDS server rpc client auth flavor | ||
128 | * in the nfs_client cl_ds_clients list. | ||
129 | */ | ||
124 | struct rpc_clnt * | 130 | struct rpc_clnt * |
125 | nfs4_find_or_create_ds_client(struct nfs_client *ds_clp, struct inode *inode) | 131 | nfs4_find_or_create_ds_client(struct nfs_client *ds_clp, struct inode *inode) |
126 | { | 132 | { |
@@ -284,7 +290,7 @@ static int nfs4_init_callback(struct nfs_client *clp) | |||
284 | 290 | ||
285 | /** | 291 | /** |
286 | * nfs40_init_client - nfs_client initialization tasks for NFSv4.0 | 292 | * nfs40_init_client - nfs_client initialization tasks for NFSv4.0 |
287 | * @clp - nfs_client to initialize | 293 | * @clp: nfs_client to initialize |
288 | * | 294 | * |
289 | * Returns zero on success, or a negative errno if some error occurred. | 295 | * Returns zero on success, or a negative errno if some error occurred. |
290 | */ | 296 | */ |
@@ -312,7 +318,7 @@ int nfs40_init_client(struct nfs_client *clp) | |||
312 | 318 | ||
313 | /** | 319 | /** |
314 | * nfs41_init_client - nfs_client initialization tasks for NFSv4.1+ | 320 | * nfs41_init_client - nfs_client initialization tasks for NFSv4.1+ |
315 | * @clp - nfs_client to initialize | 321 | * @clp: nfs_client to initialize |
316 | * | 322 | * |
317 | * Returns zero on success, or a negative errno if some error occurred. | 323 | * Returns zero on success, or a negative errno if some error occurred. |
318 | */ | 324 | */ |
@@ -360,9 +366,7 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp) | |||
360 | * nfs4_init_client - Initialise an NFS4 client record | 366 | * nfs4_init_client - Initialise an NFS4 client record |
361 | * | 367 | * |
362 | * @clp: nfs_client to initialise | 368 | * @clp: nfs_client to initialise |
363 | * @timeparms: timeout parameters for underlying RPC transport | 369 | * @cl_init: pointer to nfs_client_initdata |
364 | * @ip_addr: callback IP address in presentation format | ||
365 | * @authflavor: authentication flavor for underlying RPC transport | ||
366 | * | 370 | * |
367 | * Returns pointer to an NFS client, or an ERR_PTR value. | 371 | * Returns pointer to an NFS client, or an ERR_PTR value. |
368 | */ | 372 | */ |
@@ -649,13 +653,13 @@ nfs4_check_server_scope(struct nfs41_server_scope *s1, | |||
649 | 653 | ||
650 | /** | 654 | /** |
651 | * nfs4_detect_session_trunking - Checks for session trunking. | 655 | * nfs4_detect_session_trunking - Checks for session trunking. |
652 | * | ||
653 | * Called after a successful EXCHANGE_ID on a multi-addr connection. | ||
654 | * Upon success, add the transport. | ||
655 | * | ||
656 | * @clp: original mount nfs_client | 656 | * @clp: original mount nfs_client |
657 | * @res: result structure from an exchange_id using the original mount | 657 | * @res: result structure from an exchange_id using the original mount |
658 | * nfs_client with a new multi_addr transport | 658 | * nfs_client with a new multi_addr transport |
659 | * @xprt: pointer to the transport to add. | ||
660 | * | ||
661 | * Called after a successful EXCHANGE_ID on a multi-addr connection. | ||
662 | * Upon success, add the transport. | ||
659 | * | 663 | * |
660 | * Returns zero on success, otherwise -EINVAL | 664 | * Returns zero on success, otherwise -EINVAL |
661 | * | 665 | * |
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c index 24f06dcc2b08..2e460c33ae48 100644 --- a/fs/nfs/nfs4namespace.c +++ b/fs/nfs/nfs4namespace.c | |||
@@ -137,6 +137,7 @@ static size_t nfs_parse_server_name(char *string, size_t len, | |||
137 | 137 | ||
138 | /** | 138 | /** |
139 | * nfs_find_best_sec - Find a security mechanism supported locally | 139 | * nfs_find_best_sec - Find a security mechanism supported locally |
140 | * @clnt: pointer to rpc_clnt | ||
140 | * @server: NFS server struct | 141 | * @server: NFS server struct |
141 | * @flavors: List of security tuples returned by SECINFO procedure | 142 | * @flavors: List of security tuples returned by SECINFO procedure |
142 | * | 143 | * |
@@ -288,8 +289,8 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata, | |||
288 | 289 | ||
289 | /** | 290 | /** |
290 | * nfs_follow_referral - set up mountpoint when hitting a referral on moved error | 291 | * nfs_follow_referral - set up mountpoint when hitting a referral on moved error |
291 | * @dentry - parent directory | 292 | * @dentry: parent directory |
292 | * @locations - array of NFSv4 server location information | 293 | * @locations: array of NFSv4 server location information |
293 | * | 294 | * |
294 | */ | 295 | */ |
295 | static struct vfsmount *nfs_follow_referral(struct dentry *dentry, | 296 | static struct vfsmount *nfs_follow_referral(struct dentry *dentry, |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 557a5d636183..e8e12faa8604 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -5963,7 +5963,7 @@ out: | |||
5963 | /** | 5963 | /** |
5964 | * nfs4_proc_setclientid_confirm - Confirm client ID | 5964 | * nfs4_proc_setclientid_confirm - Confirm client ID |
5965 | * @clp: state data structure | 5965 | * @clp: state data structure |
5966 | * @res: result of a previous SETCLIENTID | 5966 | * @arg: result of a previous SETCLIENTID |
5967 | * @cred: credential to use for this call | 5967 | * @cred: credential to use for this call |
5968 | * | 5968 | * |
5969 | * Returns zero, a negative errno, or a negative NFS4ERR status code. | 5969 | * Returns zero, a negative errno, or a negative NFS4ERR status code. |
@@ -7527,7 +7527,7 @@ int nfs4_proc_fsid_present(struct inode *inode, const struct cred *cred) | |||
7527 | return status; | 7527 | return status; |
7528 | } | 7528 | } |
7529 | 7529 | ||
7530 | /** | 7530 | /* |
7531 | * If 'use_integrity' is true and the state managment nfs_client | 7531 | * If 'use_integrity' is true and the state managment nfs_client |
7532 | * cl_rpcclient is using krb5i/p, use the integrity protected cl_rpcclient | 7532 | * cl_rpcclient is using krb5i/p, use the integrity protected cl_rpcclient |
7533 | * and the machine credential as per RFC3530bis and RFC5661 Security | 7533 | * and the machine credential as per RFC3530bis and RFC5661 Security |
@@ -9219,7 +9219,7 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync) | |||
9219 | return status; | 9219 | return status; |
9220 | } | 9220 | } |
9221 | 9221 | ||
9222 | /** | 9222 | /* |
9223 | * Use the state managment nfs_client cl_rpcclient, which uses krb5i (if | 9223 | * Use the state managment nfs_client cl_rpcclient, which uses krb5i (if |
9224 | * possible) as per RFC3530bis and RFC5661 Security Considerations sections | 9224 | * possible) as per RFC3530bis and RFC5661 Security Considerations sections |
9225 | */ | 9225 | */ |
@@ -9484,7 +9484,7 @@ static const struct rpc_call_ops nfs41_free_stateid_ops = { | |||
9484 | * @server: server / transport on which to perform the operation | 9484 | * @server: server / transport on which to perform the operation |
9485 | * @stateid: state ID to release | 9485 | * @stateid: state ID to release |
9486 | * @cred: credential | 9486 | * @cred: credential |
9487 | * @is_recovery: set to true if this call needs to be privileged | 9487 | * @privileged: set to true if this call needs to be privileged |
9488 | * | 9488 | * |
9489 | * Note: this function is always asynchronous. | 9489 | * Note: this function is always asynchronous. |
9490 | */ | 9490 | */ |
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index a5489d70a724..25c5255a395c 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c | |||
@@ -55,7 +55,7 @@ static void nfs4_shrink_slot_table(struct nfs4_slot_table *tbl, u32 newsize) | |||
55 | 55 | ||
56 | /** | 56 | /** |
57 | * nfs4_slot_tbl_drain_complete - wake waiters when drain is complete | 57 | * nfs4_slot_tbl_drain_complete - wake waiters when drain is complete |
58 | * @tbl - controlling slot table | 58 | * @tbl: controlling slot table |
59 | * | 59 | * |
60 | */ | 60 | */ |
61 | void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl) | 61 | void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl) |
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 02488b50534a..3de36479ed7a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c | |||
@@ -563,6 +563,7 @@ static void nfs4_gc_state_owners(struct nfs_server *server) | |||
563 | * nfs4_get_state_owner - Look up a state owner given a credential | 563 | * nfs4_get_state_owner - Look up a state owner given a credential |
564 | * @server: nfs_server to search | 564 | * @server: nfs_server to search |
565 | * @cred: RPC credential to match | 565 | * @cred: RPC credential to match |
566 | * @gfp_flags: allocation mode | ||
566 | * | 567 | * |
567 | * Returns a pointer to an instantiated nfs4_state_owner struct, or NULL. | 568 | * Returns a pointer to an instantiated nfs4_state_owner struct, or NULL. |
568 | */ | 569 | */ |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 695afb7de3a7..e9f39fa5964b 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -350,7 +350,7 @@ nfs_create_request(struct nfs_open_context *ctx, struct page *page, | |||
350 | 350 | ||
351 | /** | 351 | /** |
352 | * nfs_unlock_request - Unlock request and wake up sleepers. | 352 | * nfs_unlock_request - Unlock request and wake up sleepers. |
353 | * @req: | 353 | * @req: pointer to request |
354 | */ | 354 | */ |
355 | void nfs_unlock_request(struct nfs_page *req) | 355 | void nfs_unlock_request(struct nfs_page *req) |
356 | { | 356 | { |
@@ -368,7 +368,7 @@ void nfs_unlock_request(struct nfs_page *req) | |||
368 | 368 | ||
369 | /** | 369 | /** |
370 | * nfs_unlock_and_release_request - Unlock request and release the nfs_page | 370 | * nfs_unlock_and_release_request - Unlock request and release the nfs_page |
371 | * @req: | 371 | * @req: pointer to request |
372 | */ | 372 | */ |
373 | void nfs_unlock_and_release_request(struct nfs_page *req) | 373 | void nfs_unlock_and_release_request(struct nfs_page *req) |
374 | { | 374 | { |
@@ -531,7 +531,6 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free); | |||
531 | * nfs_pgio_rpcsetup - Set up arguments for a pageio call | 531 | * nfs_pgio_rpcsetup - Set up arguments for a pageio call |
532 | * @hdr: The pageio hdr | 532 | * @hdr: The pageio hdr |
533 | * @count: Number of bytes to read | 533 | * @count: Number of bytes to read |
534 | * @offset: Initial offset | ||
535 | * @how: How to commit data (writes only) | 534 | * @how: How to commit data (writes only) |
536 | * @cinfo: Commit information for the call (writes only) | 535 | * @cinfo: Commit information for the call (writes only) |
537 | */ | 536 | */ |
@@ -634,7 +633,6 @@ EXPORT_SYMBOL_GPL(nfs_initiate_pgio); | |||
634 | 633 | ||
635 | /** | 634 | /** |
636 | * nfs_pgio_error - Clean up from a pageio error | 635 | * nfs_pgio_error - Clean up from a pageio error |
637 | * @desc: IO descriptor | ||
638 | * @hdr: pageio header | 636 | * @hdr: pageio header |
639 | */ | 637 | */ |
640 | static void nfs_pgio_error(struct nfs_pgio_header *hdr) | 638 | static void nfs_pgio_error(struct nfs_pgio_header *hdr) |
@@ -892,6 +890,7 @@ static bool nfs_match_lock_context(const struct nfs_lock_context *l1, | |||
892 | * nfs_can_coalesce_requests - test two requests for compatibility | 890 | * nfs_can_coalesce_requests - test two requests for compatibility |
893 | * @prev: pointer to nfs_page | 891 | * @prev: pointer to nfs_page |
894 | * @req: pointer to nfs_page | 892 | * @req: pointer to nfs_page |
893 | * @pgio: pointer to nfs_pagio_descriptor | ||
895 | * | 894 | * |
896 | * The nfs_page structures 'prev' and 'req' are compared to ensure that the | 895 | * The nfs_page structures 'prev' and 'req' are compared to ensure that the |
897 | * page data area they describe is contiguous, and that their RPC | 896 | * page data area they describe is contiguous, and that their RPC |
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 79b97b3c4427..52d533967485 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c | |||
@@ -39,6 +39,7 @@ nfs_free_unlinkdata(struct nfs_unlinkdata *data) | |||
39 | /** | 39 | /** |
40 | * nfs_async_unlink_done - Sillydelete post-processing | 40 | * nfs_async_unlink_done - Sillydelete post-processing |
41 | * @task: rpc_task of the sillydelete | 41 | * @task: rpc_task of the sillydelete |
42 | * @calldata: pointer to nfs_unlinkdata | ||
42 | * | 43 | * |
43 | * Do the directory attribute update. | 44 | * Do the directory attribute update. |
44 | */ | 45 | */ |
@@ -54,7 +55,7 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata) | |||
54 | 55 | ||
55 | /** | 56 | /** |
56 | * nfs_async_unlink_release - Release the sillydelete data. | 57 | * nfs_async_unlink_release - Release the sillydelete data. |
57 | * @task: rpc_task of the sillydelete | 58 | * @calldata: struct nfs_unlinkdata to release |
58 | * | 59 | * |
59 | * We need to call nfs_put_unlinkdata as a 'tk_release' task since the | 60 | * We need to call nfs_put_unlinkdata as a 'tk_release' task since the |
60 | * rpc_task would be freed too. | 61 | * rpc_task would be freed too. |
@@ -159,8 +160,8 @@ static int nfs_call_unlink(struct dentry *dentry, struct inode *inode, struct nf | |||
159 | 160 | ||
160 | /** | 161 | /** |
161 | * nfs_async_unlink - asynchronous unlinking of a file | 162 | * nfs_async_unlink - asynchronous unlinking of a file |
162 | * @dir: parent directory of dentry | 163 | * @dentry: parent directory of dentry |
163 | * @dentry: dentry to unlink | 164 | * @name: name of dentry to unlink |
164 | */ | 165 | */ |
165 | static int | 166 | static int |
166 | nfs_async_unlink(struct dentry *dentry, const struct qstr *name) | 167 | nfs_async_unlink(struct dentry *dentry, const struct qstr *name) |
@@ -324,6 +325,7 @@ static const struct rpc_call_ops nfs_rename_ops = { | |||
324 | * @new_dir: target directory for the rename | 325 | * @new_dir: target directory for the rename |
325 | * @old_dentry: original dentry to be renamed | 326 | * @old_dentry: original dentry to be renamed |
326 | * @new_dentry: dentry to which the old_dentry should be renamed | 327 | * @new_dentry: dentry to which the old_dentry should be renamed |
328 | * @complete: Function to run on successful completion | ||
327 | * | 329 | * |
328 | * It's expected that valid references to the dentries and inodes are held | 330 | * It's expected that valid references to the dentries and inodes are held |
329 | */ | 331 | */ |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index d1bc0384ac95..f3ebabaa291d 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -870,7 +870,6 @@ EXPORT_SYMBOL_GPL(nfs_request_add_commit_list_locked); | |||
870 | /** | 870 | /** |
871 | * nfs_request_add_commit_list - add request to a commit list | 871 | * nfs_request_add_commit_list - add request to a commit list |
872 | * @req: pointer to a struct nfs_page | 872 | * @req: pointer to a struct nfs_page |
873 | * @dst: commit list head | ||
874 | * @cinfo: holds list lock and accounting info | 873 | * @cinfo: holds list lock and accounting info |
875 | * | 874 | * |
876 | * This sets the PG_CLEAN bit, updates the cinfo count of | 875 | * This sets the PG_CLEAN bit, updates the cinfo count of |