diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-11 13:11:00 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-11 15:14:16 -0400 |
commit | 17280175c587469b34757263c7cfc608f0ea2334 (patch) | |
tree | 34a3008bfd1055e9fdb0557ea563484b67433797 /fs/nfs/nfs4filelayout.c | |
parent | 5ffaf8554163d9f3873988ce2f9977f6c6f408d2 (diff) |
NFS: Fix a number of sparse warnings
Fix a number of "warning: symbol 'foo' was not declared. Should it be
static?" conditions.
Fix 2 cases of "warning: Using plain integer as NULL pointer"
fs/nfs/delegation.c:263:31: warning: restricted fmode_t degrades to integer
- We want to allow upgrades to a WRITE delegation, but should otherwise
consider servers that hand out duplicate delegations to be borken.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 716fac6bc082..379a085f8f25 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -323,21 +323,21 @@ static void filelayout_commit_release(void *data) | |||
323 | nfs_commitdata_release(wdata); | 323 | nfs_commitdata_release(wdata); |
324 | } | 324 | } |
325 | 325 | ||
326 | struct rpc_call_ops filelayout_read_call_ops = { | 326 | static const struct rpc_call_ops filelayout_read_call_ops = { |
327 | .rpc_call_prepare = filelayout_read_prepare, | 327 | .rpc_call_prepare = filelayout_read_prepare, |
328 | .rpc_call_done = filelayout_read_call_done, | 328 | .rpc_call_done = filelayout_read_call_done, |
329 | .rpc_count_stats = filelayout_read_count_stats, | 329 | .rpc_count_stats = filelayout_read_count_stats, |
330 | .rpc_release = filelayout_read_release, | 330 | .rpc_release = filelayout_read_release, |
331 | }; | 331 | }; |
332 | 332 | ||
333 | struct rpc_call_ops filelayout_write_call_ops = { | 333 | static const struct rpc_call_ops filelayout_write_call_ops = { |
334 | .rpc_call_prepare = filelayout_write_prepare, | 334 | .rpc_call_prepare = filelayout_write_prepare, |
335 | .rpc_call_done = filelayout_write_call_done, | 335 | .rpc_call_done = filelayout_write_call_done, |
336 | .rpc_count_stats = filelayout_write_count_stats, | 336 | .rpc_count_stats = filelayout_write_count_stats, |
337 | .rpc_release = filelayout_write_release, | 337 | .rpc_release = filelayout_write_release, |
338 | }; | 338 | }; |
339 | 339 | ||
340 | struct rpc_call_ops filelayout_commit_call_ops = { | 340 | static const struct rpc_call_ops filelayout_commit_call_ops = { |
341 | .rpc_call_prepare = filelayout_write_prepare, | 341 | .rpc_call_prepare = filelayout_write_prepare, |
342 | .rpc_call_done = filelayout_write_call_done, | 342 | .rpc_call_done = filelayout_write_call_done, |
343 | .rpc_count_stats = filelayout_write_count_stats, | 343 | .rpc_count_stats = filelayout_write_count_stats, |
@@ -723,7 +723,7 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, | |||
723 | return (p_stripe == r_stripe); | 723 | return (p_stripe == r_stripe); |
724 | } | 724 | } |
725 | 725 | ||
726 | void | 726 | static void |
727 | filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, | 727 | filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, |
728 | struct nfs_page *req) | 728 | struct nfs_page *req) |
729 | { | 729 | { |
@@ -740,7 +740,7 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, | |||
740 | nfs_pageio_reset_read_mds(pgio); | 740 | nfs_pageio_reset_read_mds(pgio); |
741 | } | 741 | } |
742 | 742 | ||
743 | void | 743 | static void |
744 | filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, | 744 | filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, |
745 | struct nfs_page *req) | 745 | struct nfs_page *req) |
746 | { | 746 | { |