diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 22:36:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 22:36:06 -0400 |
commit | 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 (patch) | |
tree | 0616c0ff7d877e64d9c248a6cdff074eae258840 /drivers/md/bitmap.c | |
parent | 9b284cbdb5de3b8871014f8290d1b540e5181c21 (diff) | |
parent | 0f1db7dee200127da4c07928189748918c312031 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more vfs updates from Al Viro:
"Assorted VFS fixes and related cleanups (IMO the most interesting in
that part are f_path-related things and Eric's descriptor-related
stuff). UFS regression fixes (it got broken last cycle). 9P fixes.
fs-cache series, DAX patches, Jan's file_remove_suid() work"
[ I'd say this is much more than "fixes and related cleanups". The
file_table locking rule change by Eric Dumazet is a rather big and
fundamental update even if the patch isn't huge. - Linus ]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (49 commits)
9p: cope with bogus responses from server in p9_client_{read,write}
p9_client_write(): avoid double p9_free_req()
9p: forgetting to cancel request on interrupted zero-copy RPC
dax: bdev_direct_access() may sleep
block: Add support for DAX reads/writes to block devices
dax: Use copy_from_iter_nocache
dax: Add block size note to documentation
fs/file.c: __fget() and dup2() atomicity rules
fs/file.c: don't acquire files->file_lock in fd_install()
fs:super:get_anon_bdev: fix race condition could cause dev exceed its upper limitation
vfs: avoid creation of inode number 0 in get_next_ino
namei: make set_root_rcu() return void
make simple_positive() public
ufs: use dir_pages instead of ufs_dir_pages()
pagemap.h: move dir_pages() over there
remove the pointless include of lglock.h
fs: cleanup slight list_entry abuse
xfs: Correctly lock inode when removing suid and file capabilities
fs: Call security_ops->inode_killpriv on truncate
fs: Provide function telling whether file_remove_privs() will do anything
...
Diffstat (limited to 'drivers/md/bitmap.c')
-rw-r--r-- | drivers/md/bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 135a0907e9de..ed2346ddf4c9 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -839,7 +839,7 @@ static void bitmap_file_kick(struct bitmap *bitmap) | |||
839 | if (bitmap->storage.file) { | 839 | if (bitmap->storage.file) { |
840 | path = kmalloc(PAGE_SIZE, GFP_KERNEL); | 840 | path = kmalloc(PAGE_SIZE, GFP_KERNEL); |
841 | if (path) | 841 | if (path) |
842 | ptr = d_path(&bitmap->storage.file->f_path, | 842 | ptr = file_path(bitmap->storage.file, |
843 | path, PAGE_SIZE); | 843 | path, PAGE_SIZE); |
844 | 844 | ||
845 | printk(KERN_ALERT | 845 | printk(KERN_ALERT |
@@ -1927,7 +1927,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap) | |||
1927 | chunk_kb ? "KB" : "B"); | 1927 | chunk_kb ? "KB" : "B"); |
1928 | if (bitmap->storage.file) { | 1928 | if (bitmap->storage.file) { |
1929 | seq_printf(seq, ", file: "); | 1929 | seq_printf(seq, ", file: "); |
1930 | seq_path(seq, &bitmap->storage.file->f_path, " \t\n"); | 1930 | seq_file_path(seq, bitmap->storage.file, " \t\n"); |
1931 | } | 1931 | } |
1932 | 1932 | ||
1933 | seq_printf(seq, "\n"); | 1933 | seq_printf(seq, "\n"); |