linux-toradex.git/fs/ocfs2, branch v3.11.4

ocfs2: fix the end cluster offset of FIEMAP

2013-09-27T00:21:57+00:00

commit 28e8be31803b19d0d8f76216cb11b480b8a98bec upstream.

Call fiemap ioctl(2) with given start offset as well as an desired mapping
range should show extents if possible.  However, we somehow figure out the
end offset of mapping via 'mapping_end -= cpos' before iterating the
extent records which would cause problems if the given fiemap length is
too small to a cluster size, e.g,

Cluster size 4096:
debugfs.ocfs2 1.6.3
        Block Size Bits: 12   Cluster Size Bits: 12

The extended fiemap test utility From David:
https://gist.github.com/anonymous/6172331

# dd if=/dev/urandom of=/ocfs2/test_file bs=1M count=1000
# ./fiemap /ocfs2/test_file 4096 10
start: 4096, length: 10
File /ocfs2/test_file has 0 extents:
#	Logical          Physical         Length           Flags
	^^^^^ <-- No extent is shown

In this case, at ocfs2_fiemap(): cpos == mapping_end == 1. Hence the
loop of searching extent records was not executed at all.

This patch remove the in question 'mapping_end -= cpos', and loops
until the cpos is larger than the mapping_end as usual.

# ./fiemap /ocfs2/test_file 4096 10
start: 4096, length: 10
File /ocfs2/test_file has 1 extents:
#	Logical          Physical         Length           Flags
0:	0000000000000000 0000000056a01000 0000000006a00000 0000

Signed-off-by: Jie Liu 
Reported-by: David Weber 
Tested-by: David Weber 
Cc: Sunil Mushran 
Cc: Mark Fashen 
Cc: Joel Becker 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers

2013-08-29T02:26:38+00:00

While using pacemaker/corosync, the node numbers are generated using IP
address as opposed to serial node number generation.  This may not fit
in a 8-byte string.  Use a bigger string to print the complete node
number.

Signed-off-by: Goldwyn Rodrigues 
Cc: Mark Fasheh 
Cc: Joel Becker 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()

2013-08-14T00:57:49+00:00

Fix a NULL pointer deference while removing an empty directory, which
was introduced by commit 3704412bdbf3 ("[readdir] convert ocfs2").

  BUG: unable to handle kernel NULL pointer dereference at (null)
  IP: [<(null)>]           (null)
  PGD 6da85067 PUD 6da89067 PMD 0
  Oops: 0010 [#1] SMP
  CPU: 0 PID: 6564 Comm: rmdir Tainted: G           O 3.11.0-rc1 #4
  RIP: 0010:[<0000000000000000>]  [<          (null)>]           (null)
  Call Trace:
    ocfs2_dir_foreach+0x49/0x50 [ocfs2]
    ocfs2_empty_dir+0x12c/0x3e0 [ocfs2]
    ocfs2_unlink+0x56e/0xc10 [ocfs2]
    vfs_rmdir+0xd5/0x140
    do_rmdir+0x1cb/0x1e0
    SyS_rmdir+0x16/0x20
    system_call_fastpath+0x16/0x1b
  Code:  Bad RIP value.
  RIP  [<          (null)>]           (null)
  RSP 
  CR2: 0000000000000000

[dan.carpenter@oracle.com: fix pointer math]
Signed-off-by: Jie Liu 
Reported-by: David Weber 
Cc: Al Viro 
Cc: Joel Becker 
Cc: Mark Fasheh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: fix NULL pointer dereference in ocfs2_duplicate_clusters_by_page

2013-08-14T00:57:49+00:00

Since ocfs2_cow_file_pos will invoke ocfs2_refcount_icow with a NULL as
the struct file pointer, it finally result in a null pointer dereference
in ocfs2_duplicate_clusters_by_page.

This patch replace file pointer with inode pointer in
cow_duplicate_clusters to fix this issue.

[jeff.liu@oracle.com: rebased patch against linux-next tree]
Signed-off-by: Tiger Yang 
Signed-off-by: Jie Liu 
Cc: Joel Becker 
Cc: Mark Fasheh 
Acked-by: Tao Ma 
Tested-by: David Weber 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: Revert 40bd62e to avoid regression in extended allocation

2013-08-14T00:57:49+00:00

Revert commit 40bd62eb7fb8 ("fs/ocfs2/journal.h: add bits_wanted while
calculating credits in ocfs2_calc_extend_credits").

Unfortunately this change broke fallocate even if there is insufficient
disk space for the preallocation, which is a serious problem.

  # df -h
  /dev/sda8        22G  1.2G   21G   6% /ocfs2
  # fallocate -o 0 -l 200M /ocfs2/testfile
  fallocate: /ocfs2/test: fallocate failed: No space left on device

and a kernel warning:

  CPU: 3 PID: 3656 Comm: fallocate Tainted: G        W  O 3.11.0-rc3 #2
  Call Trace:
    dump_stack+0x77/0x9e
    warn_slowpath_common+0xc4/0x110
    warn_slowpath_null+0x2a/0x40
    start_this_handle+0x6c/0x640 [jbd2]
    jbd2__journal_start+0x138/0x300 [jbd2]
    jbd2_journal_start+0x23/0x30 [jbd2]
    ocfs2_start_trans+0x166/0x300 [ocfs2]
    __ocfs2_extend_allocation+0x38f/0xdb0 [ocfs2]
    ocfs2_allocate_unwritten_extents+0x3c9/0x520
    __ocfs2_change_file_space+0x5e0/0xa60 [ocfs2]
    ocfs2_fallocate+0xb1/0xe0 [ocfs2]
    do_fallocate+0x1cb/0x220
    SyS_fallocate+0x6f/0xb0
    system_call_fastpath+0x16/0x1b
  JBD2: fallocate wants too many credits (51216 > 4381)

Signed-off-by: Jie Liu 
Cc: Goldwyn Rodrigues 
Cc: Joel Becker 
Cc: Mark Fasheh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page()

2013-07-31T21:41:02+00:00

Add the missing NULL check of the return value of find_or_create_page() in
function ocfs2_duplicate_clusters_by_page().

[akpm@linux-foundation.org: fix layout, per Joel]
Signed-off-by: Gu Zheng 
Acked-by: Joel Becker 
Cc: Mark Fasheh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: fix NULL pointer dereference when traversing o2hb_all_regions

2013-07-03T23:07:25+00:00

There may exist NULL pointer dereference in config_item_name() when one
volume (say Volume A) unmounts while another (say Volume B) mounting.

     Volume A                          Volume B

  already Mounted.
  Unmounting, call
  o2hb_heartbeat_group_drop_item()
    -> config_item_put(item)
    set reg(A)->item.ci_name to NULL
    in function config_item_cleanup().

                                    begin mounting, call
                                    o2hb_region_pin() and tranverse all
                                    regions. When reading
                                    reg(A)->item.ci_name, it causes
                                    NULL pointer dereference.

  call o2hb_region_release() and
  del reg(A) from list.

So we should skip accessing regions that is going to release when
tranverse o2hb_all_regions.

Signed-off-by: Yiwen Jiang 
Signed-off-by: joyce 
Acked-by: Joel Becker 
Cc: Mark Fasheh 
Cc: Sunil Mushran 
Cc: Jie Liu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: adjust switch_case syntax at o2net_state_change()

2013-07-03T23:07:25+00:00

Adjust switch..case syntax at o2net_state_change to meet the kernel coding
standard.

s/printk/pr_info/.

[akpm@linux-foundation.org: revert pr_foo() change]
Signed-off-by: Jie Liu 
Acked-by: Joel Becker 
Cc: Gurudas Pai 
Cc: Mark Fasheh 
Cc: Noboru Iwamatsu 
Cc: Srinivas Eeeda 
Cc: Sunil Mushran 
Cc: Tao Ma 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: fix a comments typo at o2quo_hb_still_up()

2013-07-03T23:07:24+00:00

Fix a comment typo in o2quo_hb_still_up()

Signed-off-by: Jie Liu 
Cc: Gurudas Pai 
Cc: Joel Becker 
Cc: Mark Fasheh 
Cc: Noboru Iwamatsu 
Cc: Srinivas Eeeda 
Cc: Sunil Mushran 
Cc: Tao Ma 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ocfs2: consolidate o2hb_global_hearbeat_mode_set() naming convention

2013-07-03T23:07:24+00:00

s/o2hb_global_hearbeat_mode_set/o2hb_global_heartbeat_mode_set/ to make
the signature of those routines in a consistent manner with others for
heartbeating.

Signed-off-by: Jie Liu 
Acked-by: Sunil Mushran 
Cc: Gurudas Pai 
Cc: Joel Becker 
Cc: Mark Fasheh 
Cc: Noboru Iwamatsu 
Cc: Srinivas Eeeda 
Cc: Tao Ma 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds