History

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

Pull more vfs updates from Al Viro: "In this pile: - autofs-namespace series - dedupe stuff - more struct path constification" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (40 commits) ocfs2: implement the VFS clone_range, copy_range, and dedupe_range features ocfs2: charge quota for reflinked blocks ocfs2: fix bad pointer cast ocfs2: always unlock when completing dio writes ocfs2: don't eat io errors during _dio_end_io_write ocfs2: budget for extent tree splits when adding refcount flag ocfs2: prohibit refcounted swapfiles ocfs2: add newlines to some error messages ocfs2: convert inode refcount test to a helper simple_write_end(): don't zero in short copy into uptodate exofs: don't mess with simple_write_{begin,end} 9p: saner ->write_end() on failing copy into non-uptodate page fix gfs2_stuffed_write_end() on short copies fix ceph_write_end() nfs_write_end(): fix handling of short copies vfs: refactor clone/dedupe_file_range common functions fs: try to clone files first in vfs_copy_file_range vfs: misc struct path constification namespace.c: constify struct path passed to a bunch of primitives quota: constify struct path in quota_on ...

Linus Torvalds committed 9 years ago

Commit 0110c352 parents d9cb5bf 9763f7a64 files · +1027 −509Browse files

Showing the changes to kernel (5 of 64 files). Show all

Unified · Split

5 files
  1. kernel/audit.c +2 −2
  2. kernel/audit.h +1 −1
  3. kernel/audit_fsnotify.c +5 −5
  4. kernel/audit_tree.c +1 −1
  5. kernel/audit_watch.c +4 −4
kernel/audit.c+2−2
@@ -1893,7 +1893,7 @@ void audit_copy_inode(struct audit_names *name, const struct dentry *dentry, · 1892 unmodified lines
1893 * @call_panic: optional pointer to int that will be updated if secid fails1893 * @call_panic: optional pointer to int that will be updated if secid fails
1894 */1894 */
1895void audit_log_name(struct audit_context *context, struct audit_names *n,1895void audit_log_name(struct audit_context *context, struct audit_names *n,
1896 struct path *path, int record_num, int *call_panic)1896 const struct path *path, int record_num, int *call_panic)
1897{1897{
1898 struct audit_buffer *ab;1898 struct audit_buffer *ab;
1899 ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);1899 ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);
@@ -2081,7 +2081,7 @@ EXPORT_SYMBOL(audit_log_task_info); · 181 unmodified lines
2081 * @operation: specific link operation2081 * @operation: specific link operation
2082 * @link: the path that triggered the restriction2082 * @link: the path that triggered the restriction
2083 */2083 */
2084void audit_log_link_denied(const char *operation, struct path *link)2084void audit_log_link_denied(const char *operation, const struct path *link)
2085{2085{
2086 struct audit_buffer *ab;2086 struct audit_buffer *ab;
2087 struct audit_names *name;2087 struct audit_names *name;
kernel/audit.h+1−1
@@ -212,7 +212,7 @@ extern void audit_copy_inode(struct audit_names *name, · 211 unmodified lines
212extern void audit_log_cap(struct audit_buffer *ab, char *prefix,212extern void audit_log_cap(struct audit_buffer *ab, char *prefix,
213 kernel_cap_t *cap);213 kernel_cap_t *cap);
214extern void audit_log_name(struct audit_context *context,214extern void audit_log_name(struct audit_context *context,
215 struct audit_names *n, struct path *path,215 struct audit_names *n, const struct path *path,
216 int record_num, int *call_panic);216 int record_num, int *call_panic);
217 217
218extern int audit_pid;218extern int audit_pid;
kernel/audit_fsnotify.c+5−5
@@ -74,7 +74,7 @@ int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_ · 73 unmodified lines
74}74}
75 75
76static void audit_update_mark(struct audit_fsnotify_mark *audit_mark,76static void audit_update_mark(struct audit_fsnotify_mark *audit_mark,
77 struct inode *inode)77 const struct inode *inode)
78{78{
79 audit_mark->dev = inode ? inode->i_sb->s_dev : AUDIT_DEV_UNSET;79 audit_mark->dev = inode ? inode->i_sb->s_dev : AUDIT_DEV_UNSET;
80 audit_mark->ino = inode ? inode->i_ino : AUDIT_INO_UNSET;80 audit_mark->ino = inode ? inode->i_ino : AUDIT_INO_UNSET;
@@ -167,11 +167,11 @@ static int audit_mark_handle_event(struct fsnotify_group *group, · 86 unmodified lines
167 struct inode *to_tell,167 struct inode *to_tell,
168 struct fsnotify_mark *inode_mark,168 struct fsnotify_mark *inode_mark,
169 struct fsnotify_mark *vfsmount_mark,169 struct fsnotify_mark *vfsmount_mark,
170 u32 mask, void *data, int data_type,170 u32 mask, const void *data, int data_type,
171 const unsigned char *dname, u32 cookie)171 const unsigned char *dname, u32 cookie)
172{172{
173 struct audit_fsnotify_mark *audit_mark;173 struct audit_fsnotify_mark *audit_mark;
174 struct inode *inode = NULL;174 const struct inode *inode = NULL;
175 175
176 audit_mark = container_of(inode_mark, struct audit_fsnotify_mark, mark);176 audit_mark = container_of(inode_mark, struct audit_fsnotify_mark, mark);
177 177
@@ -179,10 +179,10 @@ static int audit_mark_handle_event(struct fsnotify_group *group, · 1 unmodified line
179 179
180 switch (data_type) {180 switch (data_type) {
181 case (FSNOTIFY_EVENT_PATH):181 case (FSNOTIFY_EVENT_PATH):
182 inode = ((struct path *)data)->dentry->d_inode;182 inode = ((const struct path *)data)->dentry->d_inode;
183 break;183 break;
184 case (FSNOTIFY_EVENT_INODE):184 case (FSNOTIFY_EVENT_INODE):
185 inode = (struct inode *)data;185 inode = (const struct inode *)data;
186 break;186 break;
187 default:187 default:
188 BUG();188 BUG();
kernel/audit_tree.c+1−1
@@ -947,7 +947,7 @@ static int audit_tree_handle_event(struct fsnotify_group *group, · 946 unmodified lines
947 struct inode *to_tell,947 struct inode *to_tell,
948 struct fsnotify_mark *inode_mark,948 struct fsnotify_mark *inode_mark,
949 struct fsnotify_mark *vfsmount_mark,949 struct fsnotify_mark *vfsmount_mark,
950 u32 mask, void *data, int data_type,950 u32 mask, const void *data, int data_type,
951 const unsigned char *file_name, u32 cookie)951 const unsigned char *file_name, u32 cookie)
952{952{
953 return 0;953 return 0;
kernel/audit_watch.c+4−4
@@ -471,10 +471,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group, · 470 unmodified lines
471 struct inode *to_tell,471 struct inode *to_tell,
472 struct fsnotify_mark *inode_mark,472 struct fsnotify_mark *inode_mark,
473 struct fsnotify_mark *vfsmount_mark,473 struct fsnotify_mark *vfsmount_mark,
474 u32 mask, void *data, int data_type,474 u32 mask, const void *data, int data_type,
475 const unsigned char *dname, u32 cookie)475 const unsigned char *dname, u32 cookie)
476{476{
477 struct inode *inode;477 const struct inode *inode;
478 struct audit_parent *parent;478 struct audit_parent *parent;
479 479
480 parent = container_of(inode_mark, struct audit_parent, mark);480 parent = container_of(inode_mark, struct audit_parent, mark);
@@ -483,10 +483,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group, · 2 unmodified lines
483 483
484 switch (data_type) {484 switch (data_type) {
485 case (FSNOTIFY_EVENT_PATH):485 case (FSNOTIFY_EVENT_PATH):
486 inode = d_backing_inode(((struct path *)data)->dentry);486 inode = d_backing_inode(((const struct path *)data)->dentry);
487 break;487 break;
488 case (FSNOTIFY_EVENT_INODE):488 case (FSNOTIFY_EVENT_INODE):
489 inode = (struct inode *)data;489 inode = (const struct inode *)data;
490 break;490 break;
491 default:491 default:
492 BUG();492 BUG();

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