aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c
index 3e33959f3ce5..884e32997698 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -312,7 +312,7 @@ static const struct super_operations sockfs_ops = {
312static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen) 312static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen)
313{ 313{
314 return dynamic_dname(dentry, buffer, buflen, "socket:[%lu]", 314 return dynamic_dname(dentry, buffer, buflen, "socket:[%lu]",
315 dentry->d_inode->i_ino); 315 d_inode(dentry)->i_ino);
316} 316}
317 317
318static const struct dentry_operations sockfs_dentry_operations = { 318static const struct dentry_operations sockfs_dentry_operations = {
@@ -375,7 +375,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
375 &socket_file_ops); 375 &socket_file_ops);
376 if (unlikely(IS_ERR(file))) { 376 if (unlikely(IS_ERR(file))) {
377 /* drop dentry, keep inode */ 377 /* drop dentry, keep inode */
378 ihold(path.dentry->d_inode); 378 ihold(d_inode(path.dentry));
379 path_put(&path); 379 path_put(&path);
380 return file; 380 return file;
381 } 381 }
@@ -497,7 +497,7 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
497 ssize_t len; 497 ssize_t len;
498 ssize_t used = 0; 498 ssize_t used = 0;
499 499
500 len = security_inode_listsecurity(dentry->d_inode, buffer, size); 500 len = security_inode_listsecurity(d_inode(dentry), buffer, size);
501 if (len < 0) 501 if (len < 0)
502 return len; 502 return len;
503 used += len; 503 used += len;