diff --git a/[refs] b/[refs] index 50ec1ff5f971..227d370ab482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4464dbc0ca6a3ab8e9d1206bc05059dae2a559d +refs/heads/master: fb408e6ccc32404a05783911b6f3fed56bd17b06 diff --git a/trunk/fs/cachefiles/bind.c b/trunk/fs/cachefiles/bind.c index a2603e7c0bb5..e10c4415e8c3 100644 --- a/trunk/fs/cachefiles/bind.c +++ b/trunk/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/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c index d1e05b047715..8d95e91c9fc4 100644 --- a/trunk/security/tomoyo/realpath.c +++ b/trunk/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;