]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 00:29:22 +0000 (16:29 -0800)
1  2 
MAINTAINERS
drivers/block/floppy.c

diff --combined MAINTAINERS
index 0b03a88e88be8e384929248a00e9af3d5a3503b1,3028d4b98af2414068453a420a3d94adc7e05ce7..2313de23b0dad531fa6821a0c8a44d01f145ce24
@@@ -707,7 -707,7 +707,7 @@@ DCCP PROTOCO
  P:    Arnaldo Carvalho de Melo
  M:    acme@mandriva.com
  L:    dccp@vger.kernel.org
 -W:    http://www.wlug.org.nz/DCCP
 +W:    http://linux-net.osdl.org/index.php/DCCP
  S:    Maintained
  
  DECnet NETWORK LAYER
@@@ -1330,24 -1330,6 +1330,24 @@@ M:    john.ronciak@intel.co
  W:    http://sourceforge.net/projects/e1000/
  S:    Supported
  
 +INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 +P:    Yi Zhu
 +M:    yi.zhu@intel.com
 +P:    James Ketrenos
 +M:    jketreno@linux.intel.com
 +L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 +W:    http://ipw2100.sourceforge.net
 +S:    Supported
 +
 +INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
 +P:    Yi Zhu
 +M:    yi.zhu@intel.com
 +P:    James Ketrenos
 +M:    jketreno@linux.intel.com
 +L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 +W:    http://ipw2200.sourceforge.net
 +S:    Supported
 +
  IOC3 DRIVER
  P:    Ralf Baechle
  M:    ralf@linux-mips.org
@@@ -1988,7 -1970,6 +1988,6 @@@ PKTCDVD DRIVE
  P:    Peter Osterlund
  M:    petero2@telia.com
  L:    linux-kernel@vger.kernel.org
- L:    packet-writing@suse.com
  S:    Maintained
  
  POSIX CLOCKS and TIMERS
diff --combined drivers/block/floppy.c
index 28002de783b62cabd88e2c779501afda5a2d7dd9,77cfd6916ff1a4180fbbc64fa420d98265d2a493..13b8a9bed66e03652d29f0a5dd9ae8f92a08069d
   * features to asm/floppy.h.
   */
  
+ /*
+  * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
+  */
  /*
   * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
   * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
@@@ -158,10 -162,6 +162,6 @@@ static int print_unex = 1
  #define FDPATCHES
  #include <linux/fdreg.h>
  
- /*
-  * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
-  */
  #include <linux/fd.h>
  #include <linux/hdreg.h>
  
@@@ -3714,12 -3714,6 +3714,12 @@@ static int floppy_open(struct inode *in
                USETF(FD_VERIFY);
        }
  
 +      /* set underlying gendisk policy to reflect real ro/rw status */
 +      if (UTESTF(FD_DISK_WRITABLE))
 +              inode->i_bdev->bd_disk->policy = 0;
 +      else
 +              inode->i_bdev->bd_disk->policy = 1;
 +
        if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL)))
                goto out2;
  
        /* Allow ioctls if we have write-permissions even if read-only open.
         * Needed so that programs such as fdrawcmd still can work on write
         * protected disks */
 -      if (filp->f_mode & 2
 -          || permission(filp->f_dentry->d_inode, 2, NULL) == 0)
 +      if ((filp->f_mode & FMODE_WRITE) || !file_permission(filp, MAY_WRITE))
                filp->private_data = (void *)8;
  
        if (UFDCS->rawcmd == 1)