summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-07-07 15:12:51 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:44:19 -0400
commitfb408e6ccc32404a05783911b6f3fed56bd17b06 (patch)
treead19408c2e4b2f8eaac9e3dc541f432fc85bc2fd
parenta4464dbc0ca6a3ab8e9d1206bc05059dae2a559d (diff)
downloadlinux-3.10-fb408e6ccc32404a05783911b6f3fed56bd17b06.tar.gz
linux-3.10-fb408e6ccc32404a05783911b6f3fed56bd17b06.tar.bz2
linux-3.10-fb408e6ccc32404a05783911b6f3fed56bd17b06.zip
get rid of pointless checks for dentry->sb == NULL
it never is... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/cachefiles/bind.c1
-rw-r--r--security/tomoyo/realpath.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
index a2603e7c0bb..e10c4415e8c 100644
--- a/fs/cachefiles/bind.c
+++ b/fs/cachefiles/bind.c
@@ -129,7 +129,6 @@ static int cachefiles_daemon_add_cache(struct cachefiles_cache *cache)
!root->d_inode->i_op->mkdir ||
!root->d_inode->i_op->setxattr ||
!root->d_inode->i_op->getxattr ||
- !root->d_sb ||
!root->d_sb->s_op ||
!root->d_sb->s_op->statfs ||
!root->d_sb->s_op->sync_fs)
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c
index d1e05b04771..8d95e91c9fc 100644
--- a/security/tomoyo/realpath.c
+++ b/security/tomoyo/realpath.c
@@ -103,7 +103,7 @@ char *tomoyo_realpath_from_path(struct path *path)
if (!buf)
break;
/* Get better name for socket. */
- if (dentry->d_sb && dentry->d_sb->s_magic == SOCKFS_MAGIC) {
+ if (dentry->d_sb->s_magic == SOCKFS_MAGIC) {
struct inode *inode = dentry->d_inode;
struct socket *sock = inode ? SOCKET_I(inode) : NULL;
struct sock *sk = sock ? sock->sk : NULL;