Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd932ae1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull second round of VFS updates from Al Viro:
 "Assorted fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xtensa simdisk: fix braino in "xtensa simdisk: switch to proc_create_data()"
  hostfs: use kmalloc instead of kzalloc
  hostfs: move HOSTFS_SUPER_MAGIC to <linux/magic.h>
  hostfs: remove "will unlock" comment
  vfs: use list_move instead of list_del/list_add
  proc_devtree: Replace include linux/module.h with linux/export.h
  create_mnt_ns: unidiomatic use of list_add()
  fs: remove dentry_lru_prune()
  Removed unused typedef to avoid "unused local typedef" warnings.
  kill fs/read_write.h
  fs: Fix hang with BSD accounting on frozen filesystem
  sun3_scsi: add ->show_info()
  nubus: Kill nubus_proc_detach_device()
  more mode_t whack-a-mole...
  do_coredump(): don't wait for thaw if coredump has already been interrupted
  do_mount(): fix a leak introduced in 3.9 ("mount: consolidate permission checks")
parents 150a8dcf 4fe56e80

arch/xtensa/platforms/iss/simdisk.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static ssize_t proc_read_simdisk(struct file *file, char __user *buf, 
}



static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,

			size_t size, loff_t *ppos)

			size_t count, loff_t *ppos)

{

	char *tmp = kmalloc(count + 1, GFP_KERNEL);

	struct simdisk *dev = PDE_DATA(file_inode(file));

drivers/hwmon/abx500.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static ssize_t show_max_alarm(struct device *dev, 
	return sprintf(buf, "%d\n", data->max_alarm[attr->index]);

}



static mode_t abx500_attrs_visible(struct kobject *kobj,

static umode_t abx500_attrs_visible(struct kobject *kobj,

				   struct attribute *attr, int n)

{

	struct device *dev = container_of(kobj, struct device, kobj);

drivers/nubus/proc.c

+0 −15
Original line number Diff line number Diff line
@@ -147,21 +147,6 @@ int nubus_proc_attach_device(struct nubus_dev *dev) 
}

EXPORT_SYMBOL(nubus_proc_attach_device);



/* FIXME: this is certainly broken! */

int nubus_proc_detach_device(struct nubus_dev *dev)

{

	struct proc_dir_entry *e;



	if ((e = dev->procdir)) {

		if (atomic_read(&e->count))

			return -EBUSY;

		remove_proc_entry(e->name, proc_bus_nubus_dir);

		dev->procdir = NULL;

	}

	return 0;

}

EXPORT_SYMBOL(nubus_proc_detach_device);



/*

 * /proc/nubus stuff

 */

drivers/scsi/sun3_NCR5380.c

+78 −105
Original line number Diff line number Diff line
@@ -661,121 +661,94 @@ static void __init NCR5380_print_options (struct Scsi_Host *instance) 
 * Inputs : instance, pointer to this instance.  

 */



static void NCR5380_print_status (struct Scsi_Host *instance)

static void lprint_Scsi_Cmnd(Scsi_Cmnd *cmd)

{

    char *pr_bfr;

    char *start;

    int len;



    NCR_PRINT(NDEBUG_ANY);

    NCR_PRINT_PHASE(NDEBUG_ANY);



    pr_bfr = (char *) __get_free_page(GFP_ATOMIC);

    if (!pr_bfr) {

	printk("NCR5380_print_status: no memory for print buffer\n");

	return;

    }

    len = NCR5380_proc_info(instance, pr_bfr, &start, 0, PAGE_SIZE, 0);

    pr_bfr[len] = 0;

    printk("\n%s\n", pr_bfr);

    free_page((unsigned long) pr_bfr);

	int i, s;

	unsigned char *command;

	printk("scsi%d: destination target %d, lun %d\n",

		H_NO(cmd), cmd->device->id, cmd->device->lun);

	printk(KERN_CONT "        command = ");

	command = cmd->cmnd;

	printk(KERN_CONT "%2d (0x%02x)", command[0], command[0]);

	for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)

		printk(KERN_CONT " %02x", command[i]);

	printk("\n");

}





/******************************************/

/*

 * /proc/scsi/[dtc pas16 t128 generic]/[0-ASC_NUM_BOARD_SUPPORTED]

 *

 * *buffer: I/O buffer

 * **start: if inout == FALSE pointer into buffer where user read should start

 * offset: current offset

 * length: length of buffer

 * hostno: Scsi_Host host_no

 * inout: TRUE - user is writing; FALSE - user is reading

 *

 * Return the number of bytes read from or written

*/



#undef SPRINTF

#define SPRINTF(fmt,args...) \

  do { if (pos + strlen(fmt) + 20 /* slop */ < buffer + length) \

	 pos += sprintf(pos, fmt , ## args); } while(0)

static

char *lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, char *pos, char *buffer,

		       int length);



static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer,

			     char **start, off_t offset, int length, int inout)

static void NCR5380_print_status(struct Scsi_Host *instance)

{

    char *pos = buffer;

	struct NCR5380_hostdata *hostdata;

    struct scsi_cmnd *ptr;

	Scsi_Cmnd *ptr;

	unsigned long flags;

    off_t begin = 0;

#define check_offset()				\

    do {					\

	if (pos - buffer < offset - begin) {	\

	    begin += pos - buffer;		\

	    pos = buffer;			\

	}					\

    } while (0)



	NCR_PRINT(NDEBUG_ANY);

	NCR_PRINT_PHASE(NDEBUG_ANY);



	hostdata = (struct NCR5380_hostdata *)instance->hostdata;



    if (inout) { /* Has data been written to the file ? */

	return(-ENOSYS);  /* Currently this is a no-op */

    }

    SPRINTF("NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);

    check_offset();

	printk("\nNCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);

	local_irq_save(flags);

    SPRINTF("NCR5380: coroutine is%s running.\n", main_running ? "" : "n't");

    check_offset();

	printk("NCR5380: coroutine is%s running.\n",

		main_running ? "" : "n't");

	if (!hostdata->connected)

	SPRINTF("scsi%d: no currently connected command\n", HOSTNO);

		printk("scsi%d: no currently connected command\n", HOSTNO);

	else

	pos = lprint_Scsi_Cmnd ((struct scsi_cmnd *) hostdata->connected,

				pos, buffer, length);

    SPRINTF("scsi%d: issue_queue\n", HOSTNO);

    check_offset();

    for (ptr = (struct scsi_cmnd *) hostdata->issue_queue; ptr; ptr = NEXT(ptr))

    {

	pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length);

	check_offset();

    }

		lprint_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected);

	printk("scsi%d: issue_queue\n", HOSTNO);

	for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))

		lprint_Scsi_Cmnd(ptr);



    SPRINTF("scsi%d: disconnected_queue\n", HOSTNO);

    check_offset();

    for (ptr = (struct scsi_cmnd *) hostdata->disconnected_queue; ptr;

	 ptr = NEXT(ptr)) {

	pos = lprint_Scsi_Cmnd (ptr, pos, buffer, length);

	check_offset();

    }

	printk("scsi%d: disconnected_queue\n", HOSTNO);

	for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;

	     ptr = NEXT(ptr))

		lprint_Scsi_Cmnd(ptr);



	local_irq_restore(flags);

    *start = buffer + (offset - begin);

    if (pos - buffer < offset - begin)

	return 0;

    else if (pos - buffer - (offset - begin) < length)

	return pos - buffer - (offset - begin);

    return length;

	printk("\n");

}



static char *lprint_Scsi_Cmnd(struct scsi_cmnd *cmd, char *pos, char *buffer,

			      int length)

static void show_Scsi_Cmnd(Scsi_Cmnd *cmd, struct seq_file *m)

{

	int i, s;

	unsigned char *command;

    SPRINTF("scsi%d: destination target %d, lun %d\n",

	seq_printf(m, "scsi%d: destination target %d, lun %d\n",

		H_NO(cmd), cmd->device->id, cmd->device->lun);

    SPRINTF("        command = ");

	seq_printf(m, "        command = ");

	command = cmd->cmnd;

    SPRINTF("%2d (0x%02x)", command[0], command[0]);

	seq_printf(m, "%2d (0x%02x)", command[0], command[0]);

	for (i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i)

	SPRINTF(" %02x", command[i]);

    SPRINTF("\n");

    return pos;

		seq_printf(m, " %02x", command[i]);

	seq_printf(m, "\n");

}



static int NCR5380_show_info(struct seq_file *m, struct Scsi_Host *instance)

{

	struct NCR5380_hostdata *hostdata;

	Scsi_Cmnd *ptr;

	unsigned long flags;



	hostdata = (struct NCR5380_hostdata *)instance->hostdata;



	seq_printf(m, "NCR5380 core release=%d.\n", NCR5380_PUBLIC_RELEASE);

	local_irq_save(flags);

	seq_printf(m, "NCR5380: coroutine is%s running.\n",

		main_running ? "" : "n't");

	if (!hostdata->connected)

		seq_printf(m, "scsi%d: no currently connected command\n", HOSTNO);

	else

		show_Scsi_Cmnd((Scsi_Cmnd *) hostdata->connected, m);

	seq_printf(m, "scsi%d: issue_queue\n", HOSTNO);

	for (ptr = (Scsi_Cmnd *)hostdata->issue_queue; ptr; ptr = NEXT(ptr))

		show_Scsi_Cmnd(ptr, m);



	seq_printf(m, "scsi%d: disconnected_queue\n", HOSTNO);

	for (ptr = (Scsi_Cmnd *) hostdata->disconnected_queue; ptr;

	     ptr = NEXT(ptr))

		show_Scsi_Cmnd(ptr, m);



	local_irq_restore(flags);

	return 0;

}



/* 

 * Function : void NCR5380_init (struct Scsi_Host *instance)

drivers/scsi/sun3_scsi.c

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ static int sun3scsi_dma_finish(int write_flag) 
#include "sun3_NCR5380.c"



static struct scsi_host_template driver_template = {

	.show_info		= sun3scsi_show_info,

	.name			= SUN3_SCSI_NAME,

	.detect			= sun3scsi_detect,

	.release		= sun3scsi_release,