Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits) fs: avoid I_NEW inodes Merge code for single and multiple-instance mounts Remove get_init_pts_sb() Move common mknod_ptmx() calls into caller Parse mount options just once and copy them to super block Unroll essentials of do_remount_sb() into devpts vfs: simple_set_mnt() should return void fs: move bdev code out of buffer.c constify dentry_operations: rest constify dentry_operations: configfs constify dentry_operations: sysfs constify dentry_operations: JFS constify dentry_operations: OCFS2 constify dentry_operations: GFS2 constify dentry_operations: FAT constify dentry_operations: FUSE constify dentry_operations: procfs constify dentry_operations: ecryptfs constify dentry_operations: CIFS constify dentry_operations: AFS ...
This commit is contained in:
@@ -860,7 +860,7 @@ static char *pipefs_dname(struct dentry *dentry, char *buffer, int buflen)
|
||||
dentry->d_inode->i_ino);
|
||||
}
|
||||
|
||||
static struct dentry_operations pipefs_dentry_operations = {
|
||||
static const struct dentry_operations pipefs_dentry_operations = {
|
||||
.d_delete = pipefs_delete_dentry,
|
||||
.d_dname = pipefs_dname,
|
||||
};
|
||||
@@ -1024,11 +1024,6 @@ int do_pipe_flags(int *fd, int flags)
|
||||
return error;
|
||||
}
|
||||
|
||||
int do_pipe(int *fd)
|
||||
{
|
||||
return do_pipe_flags(fd, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* sys_pipe() is the normal C calling standard for creating
|
||||
* a pipe. It's not the way Unix traditionally does this, though.
|
||||
|
Reference in New Issue
Block a user