projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: drm/rockchip: Disarm vop->is_enabled
[firefly-linux-kernel-4.4.55.git]
/
fs
/
reiserfs
/
procfs.c
diff --git
a/fs/reiserfs/procfs.c
b/fs/reiserfs/procfs.c
index 1d48974c25dd47f54c2c3d2a9501d04244a72d1b..621b9f381fe1faed2925d1117e13ee4452129730 100644
(file)
--- a/
fs/reiserfs/procfs.c
+++ b/
fs/reiserfs/procfs.c
@@
-11,7
+11,7
@@
#include <linux/module.h>
#include <linux/time.h>
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/time.h>
#include <linux/seq_file.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include "reiserfs.h"
#include <linux/init.h>
#include <linux/proc_fs.h>
#include "reiserfs.h"
#include <linux/init.h>
#include <linux/proc_fs.h>
@@
-392,7
+392,7
@@
static int show_journal(struct seq_file *m, void *unused)
static int r_open(struct inode *inode, struct file *file)
{
static int r_open(struct inode *inode, struct file *file)
{
- return single_open(file, PDE_DATA(inode),
+ return single_open(file, PDE_DATA(inode),
proc_get_parent_data(inode));
}
proc_get_parent_data(inode));
}
@@
-419,7
+419,7
@@
int reiserfs_proc_info_init(struct super_block *sb)
char *s;
/* Some block devices use /'s */
char *s;
/* Some block devices use /'s */
- strlcpy(b,
reiserfs_bdevname(sb)
, BDEVNAME_SIZE);
+ strlcpy(b,
sb->s_id
, BDEVNAME_SIZE);
s = strchr(b, '/');
if (s)
*s = '!';
s = strchr(b, '/');
if (s)
*s = '!';
@@
-449,7
+449,7
@@
int reiserfs_proc_info_done(struct super_block *sb)
char *s;
/* Some block devices use /'s */
char *s;
/* Some block devices use /'s */
- strlcpy(b,
reiserfs_bdevname(sb)
, BDEVNAME_SIZE);
+ strlcpy(b,
sb->s_id
, BDEVNAME_SIZE);
s = strchr(b, '/');
if (s)
*s = '!';
s = strchr(b, '/');
if (s)
*s = '!';