mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS updates from Al Viro,
Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).
7kloc removed.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
don't bother with deferred freeing of fdtables
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
proc: Make the PROC_I() and PDE() macros internal to procfs
proc: Supply a function to remove a proc entry by PDE
take cgroup_open() and cpuset_open() to fs/proc/base.c
ppc: Clean up scanlog
ppc: Clean up rtas_flash driver somewhat
hostap: proc: Use remove_proc_subtree()
drm: proc: Use remove_proc_subtree()
drm: proc: Use minor->index to label things, not PDE->name
drm: Constify drm_proc_list[]
zoran: Don't print proc_dir_entry data in debug
reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
proc: Supply an accessor for getting the data from a PDE's parent
airo: Use remove_proc_subtree()
rtl8192u: Don't need to save device proc dir PDE
rtl8187se: Use a dir under /proc/net/r8180/
proc: Add proc_mkdir_data()
proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
proc: Move PDE_NET() to fs/proc/proc_net.c
...
This commit is contained in:
commit
20b4fb4852
385 changed files with 7396 additions and 14540 deletions
|
|
@ -79,11 +79,10 @@ static void tcm_loop_release_cmd(struct se_cmd *se_cmd)
|
|||
kmem_cache_free(tcm_loop_cmd_cache, tl_cmd);
|
||||
}
|
||||
|
||||
static int tcm_loop_proc_info(struct Scsi_Host *host, char *buffer,
|
||||
char **start, off_t offset,
|
||||
int length, int inout)
|
||||
static int tcm_loop_show_info(struct seq_file *m, struct Scsi_Host *host)
|
||||
{
|
||||
return sprintf(buffer, "tcm_loop_proc_info()\n");
|
||||
seq_printf(m, "tcm_loop_proc_info()\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tcm_loop_driver_probe(struct device *);
|
||||
|
|
@ -336,7 +335,7 @@ static int tcm_loop_slave_configure(struct scsi_device *sd)
|
|||
}
|
||||
|
||||
static struct scsi_host_template tcm_loop_driver_template = {
|
||||
.proc_info = tcm_loop_proc_info,
|
||||
.show_info = tcm_loop_show_info,
|
||||
.proc_name = "tcm_loopback",
|
||||
.name = "TCM_Loopback",
|
||||
.queuecommand = tcm_loop_queuecommand,
|
||||
|
|
|
|||
Loading…
Reference in a new issue