diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
| commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
| tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /net/socket.c | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
| parent | ce23e640133484eebc20ca7b7668388213e11327 (diff) | |
| download | linux-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.bz2 | |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 5f77a8e93830..35e4523edada 100644 --- a/net/socket.c +++ b/net/socket.c @@ -466,7 +466,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) #define XATTR_SOCKPROTONAME_SUFFIX "sockprotoname" #define XATTR_NAME_SOCKPROTONAME (XATTR_SYSTEM_PREFIX XATTR_SOCKPROTONAME_SUFFIX) #define XATTR_NAME_SOCKPROTONAME_LEN (sizeof(XATTR_NAME_SOCKPROTONAME)-1) -static ssize_t sockfs_getxattr(struct dentry *dentry, +static ssize_t sockfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, void *value, size_t size) { const char *proto_name; |