linux-toradex.git/fs, branch v3.10.68

pstore/ram: avoid atomic accesses for ioremapped regions

2015-02-06T06:35:40+00:00

commit 0405a5cec3406f19e69da07c8111a6bf1088ac29 upstream.

For persistent RAM outside of main memory, the memory may have limitations
on supported accesses. For internal RAM on highbank platform exclusive
accesses are not supported and will hang the system. So atomic_cmpxchg
cannot be used. This commit uses spinlock protection for buffer size and
start updates on ioremapped regions instead.

Signed-off-by: Rob Herring 
Acked-by: Anton Vorontsov 
Signed-off-by: Tony Luck 
[hkp: Backported to 3.10: adjust context]
Signed-off-by: HuKeping

pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz

2015-02-06T06:35:40+00:00

commit b0aa931fb84431394d995472d0af2a6c2b61064d upstream.

ramoops_get_next_prz get the prz according the paramters. If it get a
uninitialized prz, access its members by following persistent_ram_old_size(prz)
will cause a NULL pointer crash.
Ex: if ftrace_size is 0, fprz will be NULL.

Fix it by return NULL in advance.

Signed-off-by: Liu ShuoX 
Acked-by: Kees Cook 
Signed-off-by: Tony Luck 
Cc: HuKeping 
Signed-off-by: Greg Kroah-Hartman

pstore: skip zero size persistent ram buffer in traverse

2015-02-06T06:35:40+00:00

commit aa9a4a1edfbd3d223af01db833da2f07850bc655 upstream.

In ramoops_pstore_read, a valid prz pointer with zero size buffer will
break traverse of all persistent ram buffers.  The latter buffer might be
lost.

Signed-off-by: Liu ShuoX 
Cc: "Zhang, Yanmin" 
Cc: Colin Cross 
Reviewed-by: Kees Cook 
Signed-off-by: Andrew Morton 
Signed-off-by: Tony Luck 
Cc: HuKeping 
Signed-off-by: Greg Kroah-Hartman

pstore: clarify clearing of _read_cnt in ramoops_context

2015-02-06T06:35:40+00:00

commit 57fd835385a043577457a385f28c08be693991bf upstream.

*_read_cnt in ramoops_context need to be cleared during pstore ->open to
support mutli times getting the records.  The patch added missed
ftrace_read_cnt clearing and removed duplicate clearing in ramoops_probe.

Signed-off-by: Liu ShuoX 
Cc: "Zhang, Yanmin" 
Cc: Colin Cross 
Cc: Kees Cook 
Signed-off-by: Andrew Morton 
Signed-off-by: Tony Luck 
Cc: HuKeping 
Signed-off-by: Greg Kroah-Hartman

pstore: d_alloc_name() doesn't return an ERR_PTR

2015-02-06T06:35:39+00:00

commit c39524e6744284452ef45480d3153bec28960c32 upstream.

d_alloc_name() returns NULL on error.  Also I changed the error code
from -ENOSPC to -ENOMEM to reflect that we were short on RAM not disk
space.

Signed-off-by: Dan Carpenter 
Acked-by: Kees Cook 
Signed-off-by: Tony Luck 
Cc: HuKeping 
Signed-off-by: Greg Kroah-Hartman

pstore: Fail to unlink if a driver has not defined pstore_erase

2015-02-06T06:35:39+00:00

commit bf2883339a33b7544b92ea465b90c3de55082032 upstream.

pstore_erase is used to erase the record from the persistent store.
So if a driver has not defined pstore_erase callback return
-EPERM instead of unlinking a file as deleting the file without
erasing its record in persistent store will give a wrong impression
to customers.

Signed-off-by: Aruna Balakrishnaiah 
Acked-by: Kees Cook 
Signed-off-by: Tony Luck 
Cc: HuKeping 
Signed-off-by: Greg Kroah-Hartman

NFSv4.1: Fix an Oops in nfs41_walk_client_list

2015-02-06T06:35:36+00:00

commit 3175e1dcec40fab1a444c010087f2068b6b04732 upstream.

If we start state recovery on a client that failed to initialise correctly,
then we are very likely to Oops.

Reported-by: "Mkrtchyan, Tigran" 
Link: http://lkml.kernel.org/r/130621862.279655.1421851650684.JavaMail.zimbra@desy.de
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

nfs: fix dio deadlock when O_DIRECT flag is flipped

2015-02-06T06:35:36+00:00

commit ee8a1a8b160a87dc3a9c81a86796aa4db85ea815 upstream.

We only support swap file calling nfs_direct_IO. However, application
might be able to get to nfs_direct_IO if it toggles O_DIRECT flag
during IO and it can deadlock because we grab inode->i_mutex in
nfs_file_direct_write(). So return 0 for such case. Then the generic
layer will fall back to buffer IO.

Signed-off-by: Peng Tao 
Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

ext4: fix warning in ext4_da_update_reserve_space()

2015-01-30T01:40:57+00:00

commit 7d7345322d60edb0fa49a64a89b31360f01d09cb upstream.

reaim workfile.dbase test easily triggers warning in
ext4_da_update_reserve_space():

EXT4-fs warning (device ram0): ext4_da_update_reserve_space:365:
ino 12, allocated 1 with only 0 reserved metadata blocks (releasing 1
blocks with reserved 9 data blocks)

The problem is that (one of) tests creates file and then randomly writes
to it with O_SYNC. That results in writing back pages of the file in
random order so we create extents for written blocks say 0, 2, 4, 6, 8
- this last allocation also allocates new block for extents. Then we
writeout block 1 so we have extents 0-2, 4, 6, 8 and we release
indirect extent block because extents fit in the inode again. Then we
writeout block 10 and we need to allocate indirect extent block again
which triggers the warning because we don't have the reservation
anymore.

Fix the problem by giving back freed metadata blocks resulting from
extent merging into inode's reservation pool.

Signed-off-by: Jan Kara 
Cc: Josh Hunt 
Signed-off-by: Greg Kroah-Hartman

quota: provide interface for readding allocated space into reserved space

2015-01-30T01:40:57+00:00

commit 1c8924eb106c1ac755d5d35ce9b3ff42e89e2511 upstream.

ext4 needs to convert allocated (metadata) blocks back into blocks
reserved for delayed allocation. Add functions into quota code for
supporting such operation.

Signed-off-by: Jan Kara 
Signed-off-by: "Theodore Ts'o" 
Cc: Josh Hunt 
Signed-off-by: Greg Kroah-Hartman