diff options
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/fs/inode.c b/fs/inode.c index 83ab215baab1..9f4f5fecc096 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -2,29 +2,19 @@ | |||
2 | * (C) 1997 Linus Torvalds | 2 | * (C) 1997 Linus Torvalds |
3 | * (C) 1999 Andrea Arcangeli <andrea@suse.de> (dynamic inode allocation) | 3 | * (C) 1999 Andrea Arcangeli <andrea@suse.de> (dynamic inode allocation) |
4 | */ | 4 | */ |
5 | #include <linux/export.h> | ||
5 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
6 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
7 | #include <linux/dcache.h> | ||
8 | #include <linux/init.h> | ||
9 | #include <linux/slab.h> | ||
10 | #include <linux/writeback.h> | ||
11 | #include <linux/module.h> | ||
12 | #include <linux/backing-dev.h> | 8 | #include <linux/backing-dev.h> |
13 | #include <linux/wait.h> | ||
14 | #include <linux/rwsem.h> | ||
15 | #include <linux/hash.h> | 9 | #include <linux/hash.h> |
16 | #include <linux/swap.h> | 10 | #include <linux/swap.h> |
17 | #include <linux/security.h> | 11 | #include <linux/security.h> |
18 | #include <linux/pagemap.h> | ||
19 | #include <linux/cdev.h> | 12 | #include <linux/cdev.h> |
20 | #include <linux/bootmem.h> | 13 | #include <linux/bootmem.h> |
21 | #include <linux/fsnotify.h> | 14 | #include <linux/fsnotify.h> |
22 | #include <linux/mount.h> | 15 | #include <linux/mount.h> |
23 | #include <linux/async.h> | ||
24 | #include <linux/posix_acl.h> | 16 | #include <linux/posix_acl.h> |
25 | #include <linux/prefetch.h> | 17 | #include <linux/prefetch.h> |
26 | #include <linux/ima.h> | ||
27 | #include <linux/cred.h> | ||
28 | #include <linux/buffer_head.h> /* for inode_has_buffers */ | 18 | #include <linux/buffer_head.h> /* for inode_has_buffers */ |
29 | #include <linux/ratelimit.h> | 19 | #include <linux/ratelimit.h> |
30 | #include "internal.h" | 20 | #include "internal.h" |
@@ -1369,17 +1359,6 @@ int generic_delete_inode(struct inode *inode) | |||
1369 | EXPORT_SYMBOL(generic_delete_inode); | 1359 | EXPORT_SYMBOL(generic_delete_inode); |
1370 | 1360 | ||
1371 | /* | 1361 | /* |
1372 | * Normal UNIX filesystem behaviour: delete the | ||
1373 | * inode when the usage count drops to zero, and | ||
1374 | * i_nlink is zero. | ||
1375 | */ | ||
1376 | int generic_drop_inode(struct inode *inode) | ||
1377 | { | ||
1378 | return !inode->i_nlink || inode_unhashed(inode); | ||
1379 | } | ||
1380 | EXPORT_SYMBOL_GPL(generic_drop_inode); | ||
1381 | |||
1382 | /* | ||
1383 | * Called when we're dropping the last reference | 1362 | * Called when we're dropping the last reference |
1384 | * to an inode. | 1363 | * to an inode. |
1385 | * | 1364 | * |
@@ -1510,9 +1489,10 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, | |||
1510 | * This function automatically handles read only file systems and media, | 1489 | * This function automatically handles read only file systems and media, |
1511 | * as well as the "noatime" flag and inode specific "noatime" markers. | 1490 | * as well as the "noatime" flag and inode specific "noatime" markers. |
1512 | */ | 1491 | */ |
1513 | void touch_atime(struct vfsmount *mnt, struct dentry *dentry) | 1492 | void touch_atime(struct path *path) |
1514 | { | 1493 | { |
1515 | struct inode *inode = dentry->d_inode; | 1494 | struct vfsmount *mnt = path->mnt; |
1495 | struct inode *inode = path->dentry->d_inode; | ||
1516 | struct timespec now; | 1496 | struct timespec now; |
1517 | 1497 | ||
1518 | if (inode->i_flags & S_NOATIME) | 1498 | if (inode->i_flags & S_NOATIME) |