1. 23 Nov, 2010 20 commits
  2. 22 Nov, 2010 10 commits
  3. 21 Nov, 2010 3 commits
  4. 20 Nov, 2010 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · b86db474
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard
        fs: Do not dispatch FITRIM through separate super_operation
        ext4: ext4_fill_super shouldn't return 0 on corruption
        jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
        ext4: missing unlock in ext4_clear_request_list()
        ext4: fix setting random pages PageUptodate
      b86db474
    • Lukas Czerner's avatar
      ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard · e681c047
      Lukas Czerner authored
      Filesystem independent ioctl was rejected as not common enough to be in
      core vfs ioctl. Since we still need to access to this functionality this
      commit adds ext4 specific ioctl EXT4_IOC_TRIM to dispatch
      ext4_trim_fs().
      
      It takes fstrim_range structure as an argument. fstrim_range is definec in
      the include/linux/fs.h and its definition is as follows.
      
      struct fstrim_range {
      	__u64 start;
      	__u64 len;
      	__u64 minlen;
      }
      
      start	- first Byte to trim
      len	- number of Bytes to trim from start
      minlen	- minimum extent length to trim, free extents shorter than this
        number of Bytes will be ignored. This will be rounded up to fs
        block size.
      
      After the FITRIM is done, the number of actually discarded Bytes is stored
      in fstrim_range.len to give the user better insight on how much storage
      space has been really released for wear-leveling.
      Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      e681c047
    • Lukas Czerner's avatar
      fs: Do not dispatch FITRIM through separate super_operation · 93bb41f4
      Lukas Czerner authored
      There was concern that FITRIM ioctl is not common enough to be included
      in core vfs ioctl, as Christoph Hellwig pointed out there's no real point
      in dispatching this out to a separate vector instead of just through
      ->ioctl.
      
      So this commit removes ioctl_fstrim() from vfs ioctl and trim_fs
      from super_operation structure.
      Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      93bb41f4
  5. 19 Nov, 2010 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 76db8ac4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        ceph: fix readdir EOVERFLOW on 32-bit archs
        ceph: fix frag offset for non-leftmost frags
        ceph: fix dangling pointer
        ceph: explicitly specify page alignment in network messages
        ceph: make page alignment explicit in osd interface
        ceph: fix comment, remove extraneous args
        ceph: fix update of ctime from MDS
        ceph: fix version check on racing inode updates
        ceph: fix uid/gid on resent mds requests
        ceph: fix rdcache_gen usage and invalidate
        ceph: re-request max_size if cap auth changes
        ceph: only let auth caps update max_size
        ceph: fix open for write on clustered mds
        ceph: fix bad pointer dereference in ceph_fill_trace
        ceph: fix small seq message skipping
        Revert "ceph: update issue_seq on cap grant"
      76db8ac4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · caf83945
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
        net: fix kernel-doc for sk_filter_rcu_release
        be2net: Fix to avoid firmware update when interface is not open.
        netfilter: fix IP_VS dependencies
        net: irda: irttp: sync error paths of data- and udata-requests
        ipv6: Expose reachable and retrans timer values as msecs
        ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
        3c59x: fix build failure on !CONFIG_PCI
        ipg.c: remove id [SUNDANCE, 0x1021]
        net: caif: spi: fix potential NULL dereference
        ath9k_htc: Avoid setting QoS control for non-QoS frames
        net: zero kobject in rx_queue_release
        net: Fix duplicate volatile warning.
        MAINTAINERS: Add stmmac maintainer
        bonding: fix a race in IGMP handling
        cfg80211: fix can_beacon_sec_chan, reenable HT40
        gianfar: fix signedness issue
        net: bnx2x: fix error value sign
        8139cp: fix checksum broken
        r8169: fix checksum broken
        rds: Integer overflow in RDS cmsg handling
        ...
      caf83945
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Revert "kernel: make /proc/kallsyms mode 400 to reduce ease of attacking" · 33e0d57f
      Linus Torvalds authored
      This reverts commit 59365d13.
      
      It turns out that this can break certain existing user land setups.
      Quoth Sarah Sharp:
      
       "On Wednesday, I updated my branch to commit 460781b5 from linus' tree,
        and my box would not boot.  klogd segfaulted, which stalled the whole
        system.
      
        At first I thought it actually hung the box, but it continued booting
        after 5 minutes, and I was able to log in.  It dropped back to the
        text console instead of the graphical bootup display for that period
        of time.  dmesg surprisingly still works.  I've bisected the problem
        down to this commit (commit 59365d13)
      
        The box is running klogd 1.5.5ubuntu3 (from Jaunty).  Yes, I know
        that's old.  I read the bit in the commit about changing the
        permissions of kallsyms after boot, but if I can't boot that doesn't
        help."
      
      So let's just keep the old default, and encourage distributions to do
      the "chmod -r /proc/kallsyms" in their bootup scripts.  This is not
      worth a kernel option to change default behavior, since it's so easily
      done in user space.
      Reported-and-bisected-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      Cc: Marcus Meissner <meissner@suse.de>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Eugene Teo <eugeneteo@kernel.org>
      Cc: Jesper Juhl <jj@chaosbits.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      33e0d57f