linux.git/fs, branch v3.0-rc6

cifs: set socket send and receive timeouts before attempting connect

2011-07-01T16:15:30+00:00

Benjamin S. reported that he was unable to suspend his machine while
it had a cifs share mounted. The freezer caused this to spew when he
tried it:

-----------------------[snip]------------------
PM: Syncing filesystems ... done.
Freezing user space processes ... (elapsed 0.01 seconds) done.
Freezing remaining freezable tasks ...
Freezing of tasks failed after 20.01 seconds (1 tasks refusing to freeze, wq_busy=0):
cifsd         S ffff880127f7b1b0     0  1821      2 0x00800000
 ffff880127f7b1b0 0000000000000046 ffff88005fe008a8 ffff8800ffffffff
 ffff880127cee6b0 0000000000011100 ffff880127737fd8 0000000000004000
 ffff880127737fd8 0000000000011100 ffff880127f7b1b0 ffff880127736010
Call Trace:
 [] ? sk_reset_timer+0xf/0x19
 [] ? tcp_connect+0x43c/0x445
 [] ? tcp_v4_connect+0x40d/0x47f
 [] ? schedule_timeout+0x21/0x1ad
 [] ? _raw_spin_lock_bh+0x9/0x1f
 [] ? release_sock+0x19/0xef
 [] ? inet_stream_connect+0x14c/0x24a
 [] ? autoremove_wake_function+0x0/0x2a
 [] ? ipv4_connect+0x39c/0x3b5 [cifs]
 [] ? cifs_reconnect+0x1fc/0x28a [cifs]
 [] ? cifs_demultiplex_thread+0x397/0xb9f [cifs]
 [] ? perf_event_exit_task+0xb9/0x1bf
 [] ? cifs_demultiplex_thread+0x0/0xb9f [cifs]
 [] ? cifs_demultiplex_thread+0x0/0xb9f [cifs]
 [] ? kthread+0x7a/0x82
 [] ? kernel_thread_helper+0x4/0x10
 [] ? kthread+0x0/0x82
 [] ? kernel_thread_helper+0x0/0x10

Restarting tasks ... done.
-----------------------[snip]------------------

We do attempt to perform a try_to_freeze in cifs_reconnect, but the
connection attempt itself seems to be taking longer than 20s to time
out. The connect timeout is governed by the socket send and receive
timeouts, so we can shorten that period by setting those timeouts
before attempting the connect instead of after.

Adam Williamson tested the patch and said that it seems to have fixed
suspending on his laptop when a cifs share is mounted.

Reported-by: Benjamin S 
Tested-by: Adam Williamson 
Signed-off-by: Jeff Layton 
Signed-off-by: Steve French

proc: restrict access to /proc/PID/io

2011-06-28T16:39:11+00:00

/proc/PID/io may be used for gathering private information.  E.g.  for
openssh and vsftpd daemons wchars/rchars may be used to learn the
precise password length.  Restrict it to processes being able to ptrace
the target process.

ptrace_may_access() is needed to prevent keeping open file descriptor of
"io" file, executing setuid binary and gathering io information of the
setuid'ed process.

Signed-off-by: Vasiliy Kulikov 
Signed-off-by: Linus Torvalds

mm: fix assertion mapping->nrpages == 0 in end_writeback()

2011-06-28T01:00:13+00:00

Under heavy memory and filesystem load, users observe the assertion
mapping->nrpages == 0 in end_writeback() trigger.  This can be caused by
page reclaim reclaiming the last page from a mapping in the following
race:

	CPU0				CPU1
  ...
  shrink_page_list()
    __remove_mapping()
      __delete_from_page_cache()
        radix_tree_delete()
					evict_inode()
					  truncate_inode_pages()
					    truncate_inode_pages_range()
					      pagevec_lookup() - finds nothing
					  end_writeback()
					    mapping->nrpages != 0 -> BUG
        page->mapping = NULL
        mapping->nrpages--

Fix the problem by doing a reliable check of mapping->nrpages under
mapping->tree_lock in end_writeback().

Analyzed by Jay , lost in LKML, and dug out
by Miklos Szeredi .

Cc: Jay 
Cc: Miklos Szeredi 
Signed-off-by: Jan Kara 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

romfs: fix romfs_get_unmapped_area() argument check

2011-06-28T01:00:12+00:00

romfs_get_unmapped_area() checks argument `len' without considering
PAGE_ALIGN which will cause do_mmap_pgoff() return -EINVAL error after
commit f67d9b1576c ("nommu: add page_align to mmap").

Fix the check by changing it in same way ramfs_nommu_get_unmapped_area()
was changed in ramfs/file-nommu.c.

Signed-off-by: Bob Liu 
Cc: David Howells 
Cc: Paul Mundt 
Acked-by: Greg Ungerer 
Cc: Geert Uytterhoeven 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2011-06-27T20:32:14+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  btrfs: fix inconsonant inode information
  Btrfs: make sure to update total_bitmaps when freeing cache V3
  Btrfs: fix type mismatch in find_free_extent()
  Btrfs: make sure to record the transid in new inodes

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

2011-06-27T16:01:29+00:00

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: prevent bogus assert when trying to remove non-existent attribute
  xfs: clear XFS_IDIRTY_RELEASE on truncate down
  xfs: reset inode per-lifetime state when recycling it

btrfs: fix inconsonant inode information

2011-06-27T15:34:27+00:00

When iputting the inode, We may leave the delayed nodes if they have some
delayed items that have not been dealt with. So when the inode is read again,
we must look up the relative delayed node, and use the information in it to
initialize the inode. Or we will get inconsonant inode information, it may
cause that the same directory index number is allocated again, and hit the
following oops:

[ 5447.554187] err add delayed dir index item(name: pglog_0.965_0) into the
insertion tree of the delayed node(root id: 262, inode id: 258, errno: -17)
[ 5447.569766] ------------[ cut here ]------------
[ 5447.575361] kernel BUG at fs/btrfs/delayed-inode.c:1301!
[SNIP]
[ 5447.790721] Call Trace:
[ 5447.793191]  [] btrfs_insert_dir_item+0x189/0x1bb [btrfs]
[ 5447.800156]  [] btrfs_add_link+0x12b/0x191 [btrfs]
[ 5447.806517]  [] btrfs_add_nondir+0x31/0x58 [btrfs]
[ 5447.812876]  [] btrfs_create+0xf9/0x197 [btrfs]
[ 5447.818961]  [] vfs_create+0x72/0x92
[ 5447.824090]  [] do_last+0x22c/0x40b
[ 5447.829133]  [] path_openat+0xc0/0x2ef
[ 5447.834438]  [] ? __perf_event_task_sched_out+0x24/0x44
[ 5447.841216]  [] ? perf_event_task_sched_out+0x59/0x67
[ 5447.847846]  [] do_filp_open+0x3d/0x87
[ 5447.853156]  [] ? strncpy_from_user+0x43/0x4d
[ 5447.859072]  [] ? getname_flags+0x2e/0x80
[ 5447.864636]  [] ? do_getname+0x14b/0x173
[ 5447.870112]  [] ? audit_getname+0x16/0x26
[ 5447.875682]  [] ? spin_lock+0xe/0x10
[ 5447.880882]  [] do_sys_open+0x69/0xae
[ 5447.886153]  [] sys_open+0x20/0x22
[ 5447.891114]  [] system_call_fastpath+0x16/0x1b

Fix it by reusing the old delayed node.

Reported-by: Jim Schutt 
Signed-off-by: Miao Xie 
Tested-by: Jim Schutt 
Signed-off-by: Chris Mason

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

2011-06-27T02:40:31+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN
  cifs: free blkcipher in smbhash

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

2011-06-27T02:39:22+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  cifs: propagate errors from cifs_get_root() to mount(2)
  cifs: tidy cifs_do_mount() up a bit
  cifs: more breakage on mount failures
  cifs: close sget() races
  cifs: pull freeing mountdata/dropping nls/freeing cifs_sb into cifs_umount()
  cifs: move cifs_umount() call into ->kill_sb()
  cifs: pull cifs_mount() call up
  sanitize cifs_umount() prototype
  cifs: initialize ->tlink_tree in cifs_setup_cifs_sb()
  cifs: allocate mountdata earlier
  cifs: leak on mount if we share superblock
  cifs: don't pass superblock to cifs_mount()
  cifs: don't leak nls on mount failure
  cifs: double free on mount failure
  take bdi setup/destruction into cifs_mount/cifs_umount

Acked-by: Steve French

Btrfs: make sure to update total_bitmaps when freeing cache V3

2011-06-25T13:31:06+00:00

A user reported this bug again where we have more bitmaps than we are supposed
to.  This is because we failed to load the free space cache, but don't update
the ctl->total_bitmaps counter when we remove entries from the tree.  This patch
fixes this problem and we should be good to go again.  Thanks,

Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason