projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netxen: cleanup rx handling
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ext3
/
inode.c
diff --git
a/fs/ext3/inode.c
b/fs/ext3/inode.c
index f8424ad8997195f0cdd2d2c1c53196f16651d7c8..5fa453b49a649dd63e681c042742320b6f54a0bf 100644
(file)
--- a/
fs/ext3/inode.c
+++ b/
fs/ext3/inode.c
@@
-37,6
+37,7
@@
#include <linux/uio.h>
#include <linux/bio.h>
#include <linux/fiemap.h>
#include <linux/uio.h>
#include <linux/bio.h>
#include <linux/fiemap.h>
+#include <linux/namei.h>
#include "xattr.h"
#include "acl.h"
#include "xattr.h"
#include "acl.h"
@@
-1160,7
+1161,7
@@
static int ext3_write_begin(struct file *file, struct address_space *mapping,
to = from + len;
retry:
to = from + len;
retry:
- page =
__grab_cache_page(mapping, index
);
+ page =
grab_cache_page_write_begin(mapping, index, flags
);
if (!page)
return -ENOMEM;
*pagep = page;
if (!page)
return -ENOMEM;
*pagep = page;
@@
-2817,9
+2818,11
@@
struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
inode->i_op = &ext3_dir_inode_operations;
inode->i_fop = &ext3_dir_operations;
} else if (S_ISLNK(inode->i_mode)) {
inode->i_op = &ext3_dir_inode_operations;
inode->i_fop = &ext3_dir_operations;
} else if (S_ISLNK(inode->i_mode)) {
- if (ext3_inode_is_fast_symlink(inode))
+ if (ext3_inode_is_fast_symlink(inode))
{
inode->i_op = &ext3_fast_symlink_inode_operations;
inode->i_op = &ext3_fast_symlink_inode_operations;
- else {
+ nd_terminate_link(ei->i_data, inode->i_size,
+ sizeof(ei->i_data) - 1);
+ } else {
inode->i_op = &ext3_symlink_inode_operations;
ext3_set_aops(inode);
}
inode->i_op = &ext3_symlink_inode_operations;
ext3_set_aops(inode);
}