diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
| commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
| tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /net/socket.c | |
| parent | 265592a1dfc31ecab02a960721a1f137e50afb17 (diff) | |
| parent | ba836a6f5ab1243ff5e08a941a2d1de8b31244e1 (diff) | |
| download | op-kernel-dev-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip op-kernel-dev-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 3ef02e9..b7a63d5 100644 --- a/net/socket.c +++ b/net/socket.c @@ -531,7 +531,7 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer, return used; } -int sockfs_setattr(struct dentry *dentry, struct iattr *iattr) +static int sockfs_setattr(struct dentry *dentry, struct iattr *iattr) { int err = simple_setattr(dentry, iattr); |
