diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-03-13 13:59:47 +0530 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:59:54 +0200 |
| commit | 78cef943deebc05bb45511057e7d1d9a21d78aa1 (patch) | |
| tree | b2bb37b8eae7fe481f16f3434c78245789d918fa /fs | |
| parent | 29c1b98bdf3a3b7ab3f3f8c3ffd2d9b7106149da (diff) | |
fs: ecryptfs: readdir: constify actor
actor is a constant in dir_context struct and
because of that we run into following build failure:
----------
fs/ecryptfs/file.c: In function ‘ecryptfs_readdir’:
fs/ecryptfs/file.c:130:2: error: assignment of read-only member ‘actor’
make[2]: *** [fs/ecryptfs/file.o] Error 1
make[1]: *** [fs/ecryptfs] Error 2
make: *** [fs] Error 2
----------
This fix is based on commit: b2497fc3057a([readdir] constify ->actor)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: 4be5c6a45a26cdfa7f6ad4a3c01cb69781f37535
Git-repo: https://android.googlesource.com/kernel/common.git
Signed-off-by: Ian Maund <imaund@codeaurora.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ecryptfs/file.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index fac9d0125..125457c87 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -116,18 +116,18 @@ static int ecryptfs_readdir(struct file *file, void *dirent, filldir_t filldir) int rc; struct file *lower_file; struct inode *inode; - struct ecryptfs_getdents_callback buf; + struct ecryptfs_getdents_callback buf = { + .dirent = dirent, + .dentry = file->f_path.dentry, + .filldir = filldir, + .filldir_called = 0, + .entries_written = 0, + .ctx.actor = ecryptfs_filldir + }; lower_file = ecryptfs_file_to_lower(file); lower_file->f_pos = file->f_pos; inode = file_inode(file); - memset(&buf, 0, sizeof(buf)); - buf.dirent = dirent; - buf.dentry = file->f_path.dentry; - buf.filldir = filldir; - buf.filldir_called = 0; - buf.entries_written = 0; - buf.ctx.actor = ecryptfs_filldir; rc = iterate_dir(lower_file, &buf.ctx); file->f_pos = lower_file->f_pos; if (rc < 0) |