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]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index
8596217
..
ad7813d
100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-934,7
+934,7
@@
static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
{
shmem_undo_range(inode, lstart, lend, false);
void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
{
shmem_undo_range(inode, lstart, lend, false);
- inode->i_ctime = inode->i_mtime =
CURRENT_TIME
;
+ inode->i_ctime = inode->i_mtime =
current_time(inode)
;
}
EXPORT_SYMBOL_GPL(shmem_truncate_range);
}
EXPORT_SYMBOL_GPL(shmem_truncate_range);
@@
-979,7
+979,7
@@
static int shmem_setattr(struct dentry *dentry, struct iattr *attr)
if (error)
return error;
i_size_write(inode, newsize);
if (error)
return error;
i_size_write(inode, newsize);
- inode->i_ctime = inode->i_mtime =
CURRENT_TIME
;
+ inode->i_ctime = inode->i_mtime =
current_time(inode)
;
}
if (newsize <= oldsize) {
loff_t holebegin = round_up(newsize, PAGE_SIZE);
}
if (newsize <= oldsize) {
loff_t holebegin = round_up(newsize, PAGE_SIZE);
@@
-2083,7
+2083,7
@@
static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
inode->i_ino = get_next_ino();
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
inode->i_ino = get_next_ino();
inode_init_owner(inode, dir, mode);
inode->i_blocks = 0;
- inode->i_atime = inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_atime = inode->i_mtime = inode->i_ctime =
current_time(inode)
;
inode->i_generation = get_seconds();
info = SHMEM_I(inode);
memset(info, 0, (char *)inode - (char *)info);
inode->i_generation = get_seconds();
info = SHMEM_I(inode);
memset(info, 0, (char *)inode - (char *)info);
@@
-2741,7
+2741,7
@@
static long shmem_fallocate(struct file *file, int mode, loff_t offset,
if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size)
i_size_write(inode, offset + len);
if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size)
i_size_write(inode, offset + len);
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
undone:
spin_lock(&inode->i_lock);
inode->i_private = NULL;
undone:
spin_lock(&inode->i_lock);
inode->i_private = NULL;
@@
-2794,7
+2794,7
@@
shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
error = 0;
dir->i_size += BOGO_DIRENT_SIZE;
error = 0;
dir->i_size += BOGO_DIRENT_SIZE;
- dir->i_ctime = dir->i_mtime =
CURRENT_TIME
;
+ dir->i_ctime = dir->i_mtime =
current_time(dir)
;
d_instantiate(dentry, inode);
dget(dentry); /* Extra count - pin the dentry in core */
}
d_instantiate(dentry, inode);
dget(dentry); /* Extra count - pin the dentry in core */
}
@@
-2862,7
+2862,7
@@
static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr
goto out;
dir->i_size += BOGO_DIRENT_SIZE;
goto out;
dir->i_size += BOGO_DIRENT_SIZE;
- inode->i_ctime = dir->i_ctime = dir->i_mtime =
CURRENT_TIME
;
+ inode->i_ctime = dir->i_ctime = dir->i_mtime =
current_time(inode)
;
inc_nlink(inode);
ihold(inode); /* New dentry reference */
dget(dentry); /* Extra pinning count for the created dentry */
inc_nlink(inode);
ihold(inode); /* New dentry reference */
dget(dentry); /* Extra pinning count for the created dentry */
@@
-2879,7
+2879,7
@@
static int shmem_unlink(struct inode *dir, struct dentry *dentry)
shmem_free_inode(inode->i_sb);
dir->i_size -= BOGO_DIRENT_SIZE;
shmem_free_inode(inode->i_sb);
dir->i_size -= BOGO_DIRENT_SIZE;
- inode->i_ctime = dir->i_ctime = dir->i_mtime =
CURRENT_TIME
;
+ inode->i_ctime = dir->i_ctime = dir->i_mtime =
current_time(inode)
;
drop_nlink(inode);
dput(dentry); /* Undo the count from "create" - this does all the work */
return 0;
drop_nlink(inode);
dput(dentry); /* Undo the count from "create" - this does all the work */
return 0;
@@
-2912,7
+2912,7
@@
static int shmem_exchange(struct inode *old_dir, struct dentry *old_dentry, stru
old_dir->i_ctime = old_dir->i_mtime =
new_dir->i_ctime = new_dir->i_mtime =
d_inode(old_dentry)->i_ctime =
old_dir->i_ctime = old_dir->i_mtime =
new_dir->i_ctime = new_dir->i_mtime =
d_inode(old_dentry)->i_ctime =
- d_inode(new_dentry)->i_ctime =
CURRENT_TIME
;
+ d_inode(new_dentry)->i_ctime =
current_time(old_dir)
;
return 0;
}
return 0;
}
@@
-2986,7
+2986,7
@@
static int shmem_rename2(struct inode *old_dir, struct dentry *old_dentry, struc
new_dir->i_size += BOGO_DIRENT_SIZE;
old_dir->i_ctime = old_dir->i_mtime =
new_dir->i_ctime = new_dir->i_mtime =
new_dir->i_size += BOGO_DIRENT_SIZE;
old_dir->i_ctime = old_dir->i_mtime =
new_dir->i_ctime = new_dir->i_mtime =
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(old_dir)
;
return 0;
}
return 0;
}
@@
-3041,7
+3041,7
@@
static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
put_page(page);
}
dir->i_size += BOGO_DIRENT_SIZE;
put_page(page);
}
dir->i_size += BOGO_DIRENT_SIZE;
- dir->i_ctime = dir->i_mtime =
CURRENT_TIME
;
+ dir->i_ctime = dir->i_mtime =
current_time(dir)
;
d_instantiate(dentry, inode);
dget(dentry);
return 0;
d_instantiate(dentry, inode);
dget(dentry);
return 0;
@@
-3692,7
+3692,7
@@
static const struct inode_operations shmem_dir_inode_operations = {
.mkdir = shmem_mkdir,
.rmdir = shmem_rmdir,
.mknod = shmem_mknod,
.mkdir = shmem_mkdir,
.rmdir = shmem_rmdir,
.mknod = shmem_mknod,
- .rename
2
= shmem_rename2,
+ .rename
= shmem_rename2,
.tmpfile = shmem_tmpfile,
#endif
#ifdef CONFIG_TMPFS_XATTR
.tmpfile = shmem_tmpfile,
#endif
#ifdef CONFIG_TMPFS_XATTR