projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
udf
/
inode.c
diff --git
a/fs/udf/inode.c
b/fs/udf/inode.c
index
55aa587
..
aad4640
100644
(file)
--- a/
fs/udf/inode.c
+++ b/
fs/udf/inode.c
@@
-886,7
+886,7
@@
static sector_t inode_getblk(struct inode *inode, sector_t block,
*new = 1;
iinfo->i_next_alloc_block = block;
iinfo->i_next_alloc_goal = newblocknum;
*new = 1;
iinfo->i_next_alloc_block = block;
iinfo->i_next_alloc_goal = newblocknum;
- inode->i_ctime = current_
fs_time(inode->i_sb
);
+ inode->i_ctime = current_
time(inode
);
if (IS_SYNC(inode))
udf_sync_inode(inode);
if (IS_SYNC(inode))
udf_sync_inode(inode);
@@
-1268,7
+1268,7
@@
set_size:
up_write(&iinfo->i_data_sem);
}
update_time:
up_write(&iinfo->i_data_sem);
}
update_time:
- inode->i_mtime = inode->i_ctime = current_
fs_time(inode->i_sb
);
+ inode->i_mtime = inode->i_ctime = current_
time(inode
);
if (IS_SYNC(inode))
udf_sync_inode(inode);
else
if (IS_SYNC(inode))
udf_sync_inode(inode);
else