Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff that didn't fit anywhere else"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
nsfs: repair kernel-doc for ns_match()
nsfs: add compat ioctl handler
fs/cramfs: Convert kmap() to kmap_local_data()
+6
-6
+4
-5
fs/cramfs/inode.c
+4
-5
fs/cramfs/inode.c
···
238
238
struct page *page = pages[i];
239
239
240
240
if (page) {
241
-
memcpy(data, kmap(page), PAGE_SIZE);
242
-
kunmap(page);
241
+
memcpy_from_page(data, page, 0, PAGE_SIZE);
243
242
put_page(page);
244
243
} else
245
244
memset(data, 0, PAGE_SIZE);
···
814
815
815
816
maxblock = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
816
817
bytes_filled = 0;
817
-
pgdata = kmap(page);
818
+
pgdata = kmap_local_page(page);
818
819
819
820
if (page->index < maxblock) {
820
821
struct super_block *sb = inode->i_sb;
···
902
903
903
904
memset(pgdata + bytes_filled, 0, PAGE_SIZE - bytes_filled);
904
905
flush_dcache_page(page);
905
-
kunmap(page);
906
+
kunmap_local(pgdata);
906
907
SetPageUptodate(page);
907
908
unlock_page(page);
908
909
return 0;
909
910
910
911
err:
911
-
kunmap(page);
912
+
kunmap_local(pgdata);
912
913
ClearPageUptodate(page);
913
914
SetPageError(page);
914
915
unlock_page(page);
+2
-1
fs/nsfs.c
+2
-1
fs/nsfs.c
···
21
21
static const struct file_operations ns_file_operations = {
22
22
.llseek = no_llseek,
23
23
.unlocked_ioctl = ns_ioctl,
24
+
.compat_ioctl = compat_ptr_ioctl,
24
25
};
25
26
26
27
static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)
···
255
254
256
255
/**
257
256
* ns_match() - Returns true if current namespace matches dev/ino provided.
258
-
* @ns_common: current ns
257
+
* @ns: current namespace
259
258
* @dev: dev_t from nsfs that will be matched against current nsfs
260
259
* @ino: ino_t from nsfs that will be matched against current nsfs
261
260
*