Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fourth vfs update from Al Viro: "d_inode() annotations from David Howells (sat in for-next since before the beginning of merge window) + four assorted fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: RCU pathwalk breakage when running into a symlink overmounting something fix I_DIO_WAKEUP definition direct-io: only inc/dec inode->i_dio_count for file systems fs/9p: fix readdir() VFS: assorted d_backing_inode() annotations VFS: fs/inode.c helpers: d_inode() annotations VFS: fs/cachefiles: d_backing_inode() annotations VFS: fs library helpers: d_inode() annotations VFS: assorted weird filesystems: d_inode() annotations VFS: normal filesystems (and lustre): d_inode() annotations VFS: security/: d_inode() annotations VFS: security/: d_backing_inode() annotations VFS: net/: d_inode() annotations VFS: net/unix: d_backing_inode() annotations VFS: kernel/: d_inode() annotations VFS: audit: d_backing_inode() annotations VFS: Fix up some ->d_inode accesses in the chelsio driver VFS: Cachefiles should perform fs modifications on the top layer only VFS: AF_UNIX sockets should call mknod on the top layer only
This commit is contained in:
@@ -153,7 +153,7 @@ static struct dentry *bfs_lookup(struct inode *dir, struct dentry *dentry,
|
||||
static int bfs_link(struct dentry *old, struct inode *dir,
|
||||
struct dentry *new)
|
||||
{
|
||||
struct inode *inode = old->d_inode;
|
||||
struct inode *inode = d_inode(old);
|
||||
struct bfs_sb_info *info = BFS_SB(inode->i_sb);
|
||||
int err;
|
||||
|
||||
@@ -176,7 +176,7 @@ static int bfs_link(struct dentry *old, struct inode *dir,
|
||||
static int bfs_unlink(struct inode *dir, struct dentry *dentry)
|
||||
{
|
||||
int error = -ENOENT;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = d_inode(dentry);
|
||||
struct buffer_head *bh;
|
||||
struct bfs_dirent *de;
|
||||
struct bfs_sb_info *info = BFS_SB(inode->i_sb);
|
||||
@@ -216,7 +216,7 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
int error = -ENOENT;
|
||||
|
||||
old_bh = new_bh = NULL;
|
||||
old_inode = old_dentry->d_inode;
|
||||
old_inode = d_inode(old_dentry);
|
||||
if (S_ISDIR(old_inode->i_mode))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -231,7 +231,7 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
||||
goto end_rename;
|
||||
|
||||
error = -EPERM;
|
||||
new_inode = new_dentry->d_inode;
|
||||
new_inode = d_inode(new_dentry);
|
||||
new_bh = bfs_find_entry(new_dir,
|
||||
new_dentry->d_name.name,
|
||||
new_dentry->d_name.len, &new_de);
|
||||
|
Reference in New Issue
Block a user