diff options
| author | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /fs/nfs/inode.c | |
| parent | Merge branch 'mark-irqs' into devel (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.tar.gz kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.zip | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'fs/nfs/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 18ab2da4eeb6..00ad1c2b217d 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -312,7 +312,7 @@ struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) } EXPORT_SYMBOL_GPL(nfs4_label_alloc); #else -void inline nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr, +void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr, struct nfs4_label *label) { } |