The patch titled git-scsi-misc: revert "st: show options currently set in sysfs" has been removed from the -mm tree. Its filename was git-scsi-misc-revert-st-show-options-currently-set-in-sysfs.patch This patch was dropped because it is obsolete The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: git-scsi-misc: revert "st: show options currently set in sysfs" From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Revert commit 0b65635a7b2cb942896655ff1bf277e6fe9f765d Author: Kai Makisara <Kai.Makisara@xxxxxxxxxxx> Date: Sun Feb 24 22:29:12 2008 +0200 Show the current binary tape driver and mode options is sysfs. A file (options) is created in each directory in /sys/class/scsi_tape. The files contain masks showing the options. The mask bit definitions are the same as used when setting the options using the MTSETDRVBUFFER function in the MTIOCTOP ioctl (defined in include/linux/mtio.h). For example: > cat /sys/class/scsi_tape/nst0/options 0x00000d07 [jejb: updated doc with correction from Randy Dunlap] Because Greg's tree buggered it up. Cc: Kai Makisara <kai.makisara@xxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Tony Jones <tonyj@xxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/scsi/st.txt | 7 ----- drivers/scsi/st.c | 43 ------------------------------------ 2 files changed, 1 insertion(+), 49 deletions(-) diff -puN Documentation/scsi/st.txt~git-scsi-misc-revert-st-show-options-currently-set-in-sysfs Documentation/scsi/st.txt --- a/Documentation/scsi/st.txt~git-scsi-misc-revert-st-show-options-currently-set-in-sysfs +++ a/Documentation/scsi/st.txt @@ -2,7 +2,7 @@ This file contains brief information abo The driver is currently maintained by Kai Mäkisara (email Kai.Makisara@xxxxxxxxxxx) -Last modified: Sun Feb 24 21:59:07 2008 by kai.makisara +Last modified: Thu Feb 21 21:54:16 2008 by kai.makisara BASICS @@ -133,11 +133,6 @@ the defaults set by the user. The value file 'dev' contains the device numbers corresponding to this device. The links 'device' and 'driver' point to the SCSI device and driver entries. -Each directory also contains the entry 'options' which shows the currently -enabled driver and mode options. The value in the file is a bit mask where the -bit definitions are the same as those used with MTSETDRVBUFFER in setting the -options. - A link named 'tape' is made from the SCSI device directory to the class directory corresponding to the mode 0 auto-rewind device (e.g., st0). diff -puN drivers/scsi/st.c~git-scsi-misc-revert-st-show-options-currently-set-in-sysfs drivers/scsi/st.c --- a/drivers/scsi/st.c~git-scsi-misc-revert-st-show-options-currently-set-in-sysfs +++ a/drivers/scsi/st.c @@ -4370,46 +4370,6 @@ st_defcompression_show(struct device *de DEVICE_ATTR(default_compression, S_IRUGO, st_defcompression_show, NULL); -static ssize_t st_options_show(struct class_device *class_dev, char *buf) -{ - struct st_modedef *STm = (struct st_modedef *)class_get_devdata(class_dev); - struct scsi_tape *STp; - int i, j, options; - ssize_t l = 0; - - for (i=0; i < st_dev_max; i++) { - for (j=0; j < ST_NBR_MODES; j++) - if (&scsi_tapes[i]->modes[j] == STm) - break; - if (j < ST_NBR_MODES) - break; - } - if (i == st_dev_max) - return 0; /* should never happen */ - - STp = scsi_tapes[i]; - - options = STm->do_buffer_writes ? MT_ST_BUFFER_WRITES : 0; - options |= STm->do_async_writes ? MT_ST_ASYNC_WRITES : 0; - options |= STm->do_read_ahead ? MT_ST_READ_AHEAD : 0; - DEB( options |= debugging ? MT_ST_DEBUGGING : 0 ); - options |= STp->two_fm ? MT_ST_TWO_FM : 0; - options |= STp->fast_mteom ? MT_ST_FAST_MTEOM : 0; - options |= STm->defaults_for_writes ? MT_ST_DEF_WRITES : 0; - options |= STp->can_bsr ? MT_ST_CAN_BSR : 0; - options |= STp->omit_blklims ? MT_ST_NO_BLKLIMS : 0; - options |= STp->can_partitions ? MT_ST_CAN_PARTITIONS : 0; - options |= STp->scsi2_logical ? MT_ST_SCSI2LOGICAL : 0; - options |= STm->sysv ? MT_ST_SYSV : 0; - options |= STp->immediate ? MT_ST_NOWAIT : 0; - options |= STp->sili ? MT_ST_SILI : 0; - - l = snprintf(buf, PAGE_SIZE, "0x%08x\n", options); - return l; -} - -CLASS_DEVICE_ATTR(options, S_IRUGO, st_options_show, NULL); - static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode) { int i, rew, error; @@ -4447,9 +4407,6 @@ static int do_create_class_files(struct error = device_create_file(st_class_member, &dev_attr_default_compression); if (error) goto out; - error = class_device_create_file(st_class_member, - &class_device_attr_options); - if (error) goto out; if (mode == 0 && rew == 0) { error = sysfs_create_link(&STp->device->sdev_gendev.kobj, _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch lib-swiotlbc-avoid-endless-loops-fix.patch git-x86.patch arch-x86-kernel-ptracec-fix-defined-but-unused-warnings.patch git-kgdb-light.patch git-acpi.patch git-acpi-fixup.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-alsa-tiwai.patch cifs-suppress-warning.patch revert-gregkh-driver-video-add-the-go7007-driver.patch revert-gregkh-driver-driver-core-remove-no-longer-used-struct-class_device.patch pm-make-wakeup-flags-available-whenever-config_pm-is-set-checkpatch-fixes.patch git-drm.patch git-dvb.patch drivers-media-video-pvrusb2-pvrusb2-sysfsc-fix-printk-warnings.patch drivers-media-video-soc_camerac-reads-return-size_t.patch git-hwmon.patch git-gfs2-nmw.patch git-hrt.patch git-ieee1394.patch drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch maple-add-driver-for-sega-dreamcast-controller.patch git-kvm.patch git-leds.patch devres-implement-pcim_iomap_regions_request_all-fix.patch devres-implement-pcim_iomap_regions_request_all-fix-fix.patch drivers-atm-firestreamc-suppress-uninitialized-var-warning.patch update-smc91x-driver-with-arm-versatile-board-info.patch fs-nfs-callback_xdrc-suppress-uninitialiized-variable-warnings.patch git-nfsd.patch git-ocfs2.patch drivers-pcmcia-soc_commonc-convert-soc_pcmcia_sockets_lock-into-a-mutex-and-make-it-static.patch git-selinux.patch revert-sched-make-sure-jiffies-is-up-to-date-before-calling-__update_rq_clock.patch git-sh.patch git-scsi-misc-revert-st-show-options-currently-set-in-sysfs.patch scsi-aic94xx-cleanups.patch scsi-fix-section-mismatch-in-aic94xx-fix.patch scsi-chc-fix-shadowed-variable-warnings-checkpatch-fixes.patch ipsc-fix-build-warning.patch drivers-scsi-initioc-suppress-compile-warning.patch drivers-scsi-hptiopc-fix-build-warning.patch drivers-scsi-mvsasc-fix-build-warnings.patch git-block-git-rejects.patch git-unionfs.patch fix-gregkh-usb-usb-add-usb-serial-spcp8x5-driver.patch fix-gregkh-usb-usb-ohci-port-reset-paranoia-timeout.patch drivers-usb-core-devioc-suppress-warning-with-64k-page_size.patch git-v9fs.patch git-watchdog.patch git-semaphore-git-rejects.patch x86-fix-aperture-vs-suspend-problem-checkpatch-fixes.patch revert-pcie-utilize-pcie-transaction-pending-bit.patch remove-sparse-warning-for-mmzoneh-checkpatch-fixes.patch fix-invalidate_inode_pages2_range-to-not-clear-ret-checkpatch-fixes.patch mm-make-mem_map-allocation-continuous-checkpatch-fixes.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch capabilities-implement-per-process-securebits-warning-fix.patch lsm-introduce-inode_getsecid-and-ipc_getsecid-hooks-checkpatch-fixes.patch lsm-audit-introduce-generic-audit-lsm-hooks-checkpatch-fixes.patch selinux-use-new-audit-hooks-remove-redundant-exports-checkpatch-fixes.patch audit-final-renamings-and-cleanup-checkpatch-fixes.patch make-dev-kmem-a-config-option-fix.patch misc-phantom-add-compat-ioctl-checkpatch-fixes.patch kernel-add-clamp-and-clamp_t-macros.patch sysrq-add-show-backtrace-on-all-cpus-function-checkpatch-fixes.patch sysrq-add-show-backtrace-on-all-cpus-function-checkpatch-fixes-cleanup.patch codafs-fix-build-warning.patch lib-swiotlbc-cleanups.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir-fix.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers-fix.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly-fix-2.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create-fix.patch fs-inodec-use-hlist_for_each_entry-checkpatch-fixes.patch add-rcu_assign_index-if-ever-needed-fix.patch add-warn_on_secs-macro-simplification-fix.patch uart_get_baud_rate-stop-mangling-termios-fix.patch oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch vt-notifier-extension-for-accessibility-checkpatch-fixes.patch kprobes-prevent-probing-of-preempt_schedule-fix.patch kprobes-prevent-probing-of-preempt_schedule-checkpatch-fixes.patch quota-various-style-cleanups-checkpatch-fixes.patch quota-quota-core-changes-for-quotaon-on-remount-quota-ext3-make-ext3-handle-quotaon-on-remount-checkpatch-fixes.patch quota-quota-core-changes-for-quotaon-on-remount-quota-ext4-make-ext4-handle-quotaon-on-remount-checkpatch-fixes.patch rtc-isl1208-new-style-conversion-and-minor-bug-fixes-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes.patch rtc-pcf8563-new-style-conversion-checkpatch-fixes-fix.patch rtc-x1205-new-style-conversion-checkpatch-fixes.patch gpiochip_reserve-fix.patch fb-add-support-for-foreign-endianness-force-it-on.patch fbcon-replace-mono_col-macro-with-static-inline-fix.patch pnp-use-dev_printk-for-quirk-messages-fix.patch fat_valid_media-remove-pointless-test.patch cgroup-api-files-update-cpusets-to-use-cgroup-structured-file-api-fix.patch add-a-document-describing-the-resource-counter-abstraction-v2-fix.patch workqueues-shrink-cpu_populated_map-when-cpu-dies-fix.patch ext4-is-broken.patch ipc-use-ipc_buildid-directly-from-ipc_addid-cleanup.patch ipmi-run-to-completion-fixes-checkpatch-fixes.patch ipmi-style-fixes-in-the-system-interface-code-checkpatch-fixes.patch elf-fix-shadowed-variables-in-fs-binfmt_elfc.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node-fix-2.patch epcac-static-functions-and-integer-as-null-pointer-fixes-checkpatch-fixes.patch keys-add-keyctl-function-to-get-a-security-label-fix.patch procfs-task-exe-symlink-fix.patch edd-add-default-mode-config_edd_off=n-override-with-edd=onoff-fix.patch mm-bdi-export-bdi-attributes-in-sysfs-ia64-fix.patch basic-braille-screen-reader-support-ppc-fix.patch hfs-fix-warning-with-64k-page_size.patch hfsplus-fix-warning-with-64k-page_size.patch alloc_uid-cleanup.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros.patch profile-likely-unlikely-macros-fix.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch w1-build-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html