mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-17 01:34:00 +08:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext2, udf, reiserfs fixes from Jan Kara: "Several ext2, udf, and reiserfs fixes" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix memory leak when truncate races ext2_get_blocks reiserfs: fix race in prealloc discard reiserfs: don't preallocate blocks for extended attributes udf: Convert udf_disk_stamp_to_time() to use mktime64() udf: Use time64_to_tm for timestamp conversion udf: Fix deadlock between writeback and udf_setsize() udf: Use i_size_read() in udf_adinicb_writepage() udf: Fix races with i_size changes during readpage udf: Remove unused UDF_DEFAULT_BLOCKSIZE
This commit is contained in:
Linus Torvalds
commit
19c6e12c07
@ -659,6 +659,7 @@ static int ext2_get_blocks(struct inode *inode,
|
||||
*/
|
||||
err = -EAGAIN;
|
||||
count = 0;
|
||||
partial = chain + depth - 1;
|
||||
break;
|
||||
}
|
||||
blk = le32_to_cpu(*(chain[depth-1].p + count));
|
||||
|
||||
@ -513,9 +513,17 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,
|
||||
"inode has negative prealloc blocks count.");
|
||||
#endif
|
||||
while (ei->i_prealloc_count > 0) {
|
||||
reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block);
|
||||
ei->i_prealloc_block++;
|
||||
b_blocknr_t block_to_free;
|
||||
|
||||
/*
|
||||
* reiserfs_free_prealloc_block can drop the write lock,
|
||||
* which could allow another caller to free the same block.
|
||||
* We can protect against it by modifying the prealloc
|
||||
* state before calling it.
|
||||
*/
|
||||
block_to_free = ei->i_prealloc_block++;
|
||||
ei->i_prealloc_count--;
|
||||
reiserfs_free_prealloc_block(th, inode, block_to_free);
|
||||
dirty = 1;
|
||||
}
|
||||
if (dirty)
|
||||
@ -1128,7 +1136,7 @@ static int determine_prealloc_size(reiserfs_blocknr_hint_t * hint)
|
||||
hint->prealloc_size = 0;
|
||||
|
||||
if (!hint->formatted_node && hint->preallocate) {
|
||||
if (S_ISREG(hint->inode->i_mode)
|
||||
if (S_ISREG(hint->inode->i_mode) && !IS_PRIVATE(hint->inode)
|
||||
&& hint->inode->i_size >=
|
||||
REISERFS_SB(hint->th->t_super)->s_alloc_options.
|
||||
preallocmin * hint->inode->i_sb->s_blocksize)
|
||||
|
||||
@ -43,10 +43,15 @@ static void __udf_adinicb_readpage(struct page *page)
|
||||
struct inode *inode = page->mapping->host;
|
||||
char *kaddr;
|
||||
struct udf_inode_info *iinfo = UDF_I(inode);
|
||||
loff_t isize = i_size_read(inode);
|
||||
|
||||
/*
|
||||
* We have to be careful here as truncate can change i_size under us.
|
||||
* So just sample it once and use the same value everywhere.
|
||||
*/
|
||||
kaddr = kmap_atomic(page);
|
||||
memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size);
|
||||
memset(kaddr + inode->i_size, 0, PAGE_SIZE - inode->i_size);
|
||||
memcpy(kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, isize);
|
||||
memset(kaddr + isize, 0, PAGE_SIZE - isize);
|
||||
flush_dcache_page(page);
|
||||
SetPageUptodate(page);
|
||||
kunmap_atomic(kaddr);
|
||||
@ -71,7 +76,8 @@ static int udf_adinicb_writepage(struct page *page,
|
||||
BUG_ON(!PageLocked(page));
|
||||
|
||||
kaddr = kmap_atomic(page);
|
||||
memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);
|
||||
memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,
|
||||
i_size_read(inode));
|
||||
SetPageUptodate(page);
|
||||
kunmap_atomic(kaddr);
|
||||
mark_inode_dirty(inode);
|
||||
|
||||
@ -1222,8 +1222,8 @@ int udf_setsize(struct inode *inode, loff_t newsize)
|
||||
return err;
|
||||
}
|
||||
set_size:
|
||||
truncate_setsize(inode, newsize);
|
||||
up_write(&iinfo->i_data_sem);
|
||||
truncate_setsize(inode, newsize);
|
||||
} else {
|
||||
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
|
||||
down_write(&iinfo->i_data_sem);
|
||||
@ -1240,9 +1240,9 @@ set_size:
|
||||
udf_get_block);
|
||||
if (err)
|
||||
return err;
|
||||
truncate_setsize(inode, newsize);
|
||||
down_write(&iinfo->i_data_sem);
|
||||
udf_clear_extent_cache(inode);
|
||||
truncate_setsize(inode, newsize);
|
||||
udf_truncate_extents(inode);
|
||||
up_write(&iinfo->i_data_sem);
|
||||
}
|
||||
|
||||
@ -73,8 +73,6 @@
|
||||
#define VDS_POS_TERMINATING_DESC 6
|
||||
#define VDS_POS_LENGTH 7
|
||||
|
||||
#define UDF_DEFAULT_BLOCKSIZE 2048
|
||||
|
||||
#define VSD_FIRST_SECTOR_OFFSET 32768
|
||||
#define VSD_MAX_SECTOR_OFFSET 0x800000
|
||||
|
||||
|
||||
@ -38,56 +38,11 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
|
||||
#define EPOCH_YEAR 1970
|
||||
|
||||
#ifndef __isleap
|
||||
/* Nonzero if YEAR is a leap year (every 4 years,
|
||||
except every 100th isn't, and every 400th is). */
|
||||
#define __isleap(year) \
|
||||
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
|
||||
#endif
|
||||
|
||||
/* How many days come before each month (0-12). */
|
||||
static const unsigned short int __mon_yday[2][13] = {
|
||||
/* Normal years. */
|
||||
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
|
||||
/* Leap years. */
|
||||
{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366}
|
||||
};
|
||||
|
||||
#define MAX_YEAR_SECONDS 69
|
||||
#define SPD 0x15180 /*3600*24 */
|
||||
#define SPY(y, l, s) (SPD * (365 * y + l) + s)
|
||||
|
||||
static time_t year_seconds[MAX_YEAR_SECONDS] = {
|
||||
/*1970*/ SPY(0, 0, 0), SPY(1, 0, 0), SPY(2, 0, 0), SPY(3, 1, 0),
|
||||
/*1974*/ SPY(4, 1, 0), SPY(5, 1, 0), SPY(6, 1, 0), SPY(7, 2, 0),
|
||||
/*1978*/ SPY(8, 2, 0), SPY(9, 2, 0), SPY(10, 2, 0), SPY(11, 3, 0),
|
||||
/*1982*/ SPY(12, 3, 0), SPY(13, 3, 0), SPY(14, 3, 0), SPY(15, 4, 0),
|
||||
/*1986*/ SPY(16, 4, 0), SPY(17, 4, 0), SPY(18, 4, 0), SPY(19, 5, 0),
|
||||
/*1990*/ SPY(20, 5, 0), SPY(21, 5, 0), SPY(22, 5, 0), SPY(23, 6, 0),
|
||||
/*1994*/ SPY(24, 6, 0), SPY(25, 6, 0), SPY(26, 6, 0), SPY(27, 7, 0),
|
||||
/*1998*/ SPY(28, 7, 0), SPY(29, 7, 0), SPY(30, 7, 0), SPY(31, 8, 0),
|
||||
/*2002*/ SPY(32, 8, 0), SPY(33, 8, 0), SPY(34, 8, 0), SPY(35, 9, 0),
|
||||
/*2006*/ SPY(36, 9, 0), SPY(37, 9, 0), SPY(38, 9, 0), SPY(39, 10, 0),
|
||||
/*2010*/ SPY(40, 10, 0), SPY(41, 10, 0), SPY(42, 10, 0), SPY(43, 11, 0),
|
||||
/*2014*/ SPY(44, 11, 0), SPY(45, 11, 0), SPY(46, 11, 0), SPY(47, 12, 0),
|
||||
/*2018*/ SPY(48, 12, 0), SPY(49, 12, 0), SPY(50, 12, 0), SPY(51, 13, 0),
|
||||
/*2022*/ SPY(52, 13, 0), SPY(53, 13, 0), SPY(54, 13, 0), SPY(55, 14, 0),
|
||||
/*2026*/ SPY(56, 14, 0), SPY(57, 14, 0), SPY(58, 14, 0), SPY(59, 15, 0),
|
||||
/*2030*/ SPY(60, 15, 0), SPY(61, 15, 0), SPY(62, 15, 0), SPY(63, 16, 0),
|
||||
/*2034*/ SPY(64, 16, 0), SPY(65, 16, 0), SPY(66, 16, 0), SPY(67, 17, 0),
|
||||
/*2038*/ SPY(68, 17, 0)
|
||||
};
|
||||
|
||||
#define SECS_PER_HOUR (60 * 60)
|
||||
#define SECS_PER_DAY (SECS_PER_HOUR * 24)
|
||||
#include <linux/time.h>
|
||||
|
||||
struct timespec *
|
||||
udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src)
|
||||
{
|
||||
int yday;
|
||||
u16 typeAndTimezone = le16_to_cpu(src.typeAndTimezone);
|
||||
u16 year = le16_to_cpu(src.year);
|
||||
uint8_t type = typeAndTimezone >> 12;
|
||||
@ -102,15 +57,9 @@ udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src)
|
||||
} else
|
||||
offset = 0;
|
||||
|
||||
if ((year < EPOCH_YEAR) ||
|
||||
(year >= EPOCH_YEAR + MAX_YEAR_SECONDS)) {
|
||||
return NULL;
|
||||
}
|
||||
dest->tv_sec = year_seconds[year - EPOCH_YEAR];
|
||||
dest->tv_sec = mktime64(year, src.month, src.day, src.hour, src.minute,
|
||||
src.second);
|
||||
dest->tv_sec -= offset * 60;
|
||||
|
||||
yday = ((__mon_yday[__isleap(year)][src.month - 1]) + src.day - 1);
|
||||
dest->tv_sec += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second;
|
||||
dest->tv_nsec = 1000 * (src.centiseconds * 10000 +
|
||||
src.hundredsOfMicroseconds * 100 + src.microseconds);
|
||||
return dest;
|
||||
@ -119,9 +68,9 @@ udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src)
|
||||
struct timestamp *
|
||||
udf_time_to_disk_stamp(struct timestamp *dest, struct timespec ts)
|
||||
{
|
||||
long int days, rem, y;
|
||||
const unsigned short int *ip;
|
||||
long seconds;
|
||||
int16_t offset;
|
||||
struct tm tm;
|
||||
|
||||
offset = -sys_tz.tz_minuteswest;
|
||||
|
||||
@ -130,35 +79,14 @@ udf_time_to_disk_stamp(struct timestamp *dest, struct timespec ts)
|
||||
|
||||
dest->typeAndTimezone = cpu_to_le16(0x1000 | (offset & 0x0FFF));
|
||||
|
||||
ts.tv_sec += offset * 60;
|
||||
days = ts.tv_sec / SECS_PER_DAY;
|
||||
rem = ts.tv_sec % SECS_PER_DAY;
|
||||
dest->hour = rem / SECS_PER_HOUR;
|
||||
rem %= SECS_PER_HOUR;
|
||||
dest->minute = rem / 60;
|
||||
dest->second = rem % 60;
|
||||
y = 1970;
|
||||
|
||||
#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
|
||||
#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
|
||||
|
||||
while (days < 0 || days >= (__isleap(y) ? 366 : 365)) {
|
||||
long int yg = y + days / 365 - (days % 365 < 0);
|
||||
|
||||
/* Adjust DAYS and Y to match the guessed year. */
|
||||
days -= ((yg - y) * 365
|
||||
+ LEAPS_THRU_END_OF(yg - 1)
|
||||
- LEAPS_THRU_END_OF(y - 1));
|
||||
y = yg;
|
||||
}
|
||||
dest->year = cpu_to_le16(y);
|
||||
ip = __mon_yday[__isleap(y)];
|
||||
for (y = 11; days < (long int)ip[y]; --y)
|
||||
continue;
|
||||
days -= ip[y];
|
||||
dest->month = y + 1;
|
||||
dest->day = days + 1;
|
||||
|
||||
seconds = ts.tv_sec + offset * 60;
|
||||
time64_to_tm(seconds, 0, &tm);
|
||||
dest->year = cpu_to_le16(tm.tm_year + 1900);
|
||||
dest->month = tm.tm_mon + 1;
|
||||
dest->day = tm.tm_mday;
|
||||
dest->hour = tm.tm_hour;
|
||||
dest->minute = tm.tm_min;
|
||||
dest->second = tm.tm_sec;
|
||||
dest->centiseconds = ts.tv_nsec / 10000000;
|
||||
dest->hundredsOfMicroseconds = (ts.tv_nsec / 1000 -
|
||||
dest->centiseconds * 10000) / 100;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user