History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile 1 from Al Viro: "This is _not_ all; in particular, Miklos' and Jan's stuff is not there yet." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits) ext4: initialization of ext4_li_mtx needs to be done earlier debugfs-related mode_t whack-a-mole hfsplus: add an ioctl to bless files hfsplus: change finder_info to u32 hfsplus: initialise userflags qnx4: new helper - try_extent() qnx4: get rid of qnx4_bread/qnx4_getblk take removal of PF_FORKNOEXEC to flush_old_exec() trim includes in inode.c um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it um: embed ->stub_pages[] into mmu_context gadgetfs: list_for_each_safe() misuse ocfs2: fix leaks on failure exits in module_init ecryptfs: make register_filesystem() the last potential failure exit ntfs: forgets to unregister sysctls on register_filesystem() failure logfs: missing cleanup on register_filesystem() failure jfs: mising cleanup on register_filesystem() failure make configfs_pin_fs() return root dentry on success configfs: configfs_create_dir() has parent dentry in dentry->d_parent configfs: sanitize configfs_create() ...

Linus Torvalds committed 14 years ago

Commit e2a08832 parents 3a990a5 07c0c5d186 files · +5360 −4141Browse files

Showing the changes to kernel (3 of 186 files). Show all

Unified · Split

3 files
  1. kernel/audit.c +1 −1
  2. kernel/cgroup.c +2 −6
  3. kernel/trace/trace_output.c +1 −1
kernel/audit.c+1−1
@@ -1418,7 +1418,7 @@ void audit_log_untrustedstring(struct audit_buffer *ab, const char *string) · 1417 unmodified lines
14181418
14191419 /* This is a helper-function to print the escaped d_path */
14201420 void audit_log_d_path(struct audit_buffer *ab, const char *prefix,
1421− struct path *path)
1421+ const struct path *path)
14221422 {
14231423 char *p, *pathname;
14241424
kernel/cgroup.c+2−6
@@ -1472,7 +1472,6 @@ static int cgroup_get_rootdir(struct super_block *sb) · 1471 unmodified lines
14721472
14731473 struct inode *inode =
14741474 cgroup_new_inode(S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR, sb);
1475− struct dentry *dentry;
14761475
14771476 if (!inode)
14781477 return -ENOMEM;
@@ -1481,12 +1480,9 @@ static int cgroup_get_rootdir(struct super_block *sb) · 2 unmodified lines
14811480 inode->i_op = &cgroup_dir_inode_operations;
14821481 /* directories start off with i_nlink == 2 (for "." entry) */
14831482 inc_nlink(inode);
1484− dentry = d_alloc_root(inode);
1485− if (!dentry) {
1486− iput(inode);
1483+ sb->s_root = d_make_root(inode);
1484+ if (!sb->s_root)
14871485 return -ENOMEM;
1488− }
1489− sb->s_root = dentry;
14901486 /* for everything else we want ->d_op set */
14911487 sb->s_d_op = &cgroup_dops;
14921488 return 0;
kernel/trace/trace_output.c+1−1
@@ -264,7 +264,7 @@ void *trace_seq_reserve(struct trace_seq *s, size_t len) · 263 unmodified lines
264264 return ret;
265265 }
266266
267−int trace_seq_path(struct trace_seq *s, struct path *path)
267+int trace_seq_path(struct trace_seq *s, const struct path *path)
268268 {
269269 unsigned char *p;
270270

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t