2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* fs/cifs/inode.c
|
|
|
|
*
|
2010-04-21 08:12:10 +04:00
|
|
|
* Copyright (C) International Business Machines Corp., 2002,2010
|
2005-04-17 02:20:36 +04:00
|
|
|
* Author(s): Steve French (sfrench@us.ibm.com)
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
|
|
* by the Free Software Foundation; either version 2.1 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
|
|
* the GNU Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/stat.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/pagemap.h>
|
2014-04-30 17:31:47 +04:00
|
|
|
#include <linux/freezer.h>
|
2017-02-02 21:15:33 +03:00
|
|
|
#include <linux/sched/signal.h>
|
2017-06-20 13:19:09 +03:00
|
|
|
#include <linux/wait_bit.h>
|
2017-02-02 21:15:33 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <asm/div64.h>
|
|
|
|
#include "cifsfs.h"
|
|
|
|
#include "cifspdu.h"
|
|
|
|
#include "cifsglob.h"
|
|
|
|
#include "cifsproto.h"
|
|
|
|
#include "cifs_debug.h"
|
|
|
|
#include "cifs_fs_sb.h"
|
2014-09-27 11:19:01 +04:00
|
|
|
#include "cifs_unicode.h"
|
2010-07-05 16:42:45 +04:00
|
|
|
#include "fscache.h"
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-02-15 23:55:05 +03:00
|
|
|
|
2011-01-14 21:45:47 +03:00
|
|
|
static void cifs_set_ops(struct inode *inode)
|
2008-02-15 23:55:05 +03:00
|
|
|
{
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
|
|
|
|
|
|
|
switch (inode->i_mode & S_IFMT) {
|
|
|
|
case S_IFREG:
|
|
|
|
inode->i_op = &cifs_file_inode_ops;
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) {
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
|
|
|
|
inode->i_fop = &cifs_file_direct_nobrl_ops;
|
|
|
|
else
|
|
|
|
inode->i_fop = &cifs_file_direct_ops;
|
2010-12-12 13:11:13 +03:00
|
|
|
} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) {
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
|
|
|
|
inode->i_fop = &cifs_file_strict_nobrl_ops;
|
|
|
|
else
|
|
|
|
inode->i_fop = &cifs_file_strict_ops;
|
2008-02-15 23:55:05 +03:00
|
|
|
} else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
|
|
|
|
inode->i_fop = &cifs_file_nobrl_ops;
|
|
|
|
else { /* not direct, send byte range locks */
|
|
|
|
inode->i_fop = &cifs_file_ops;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check if server can support readpages */
|
2010-09-21 03:01:35 +04:00
|
|
|
if (cifs_sb_master_tcon(cifs_sb)->ses->server->maxBuf <
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
PAGE_SIZE + MAX_CIFS_HDR_SIZE)
|
2008-02-15 23:55:05 +03:00
|
|
|
inode->i_data.a_ops = &cifs_addr_ops_smallbuf;
|
|
|
|
else
|
|
|
|
inode->i_data.a_ops = &cifs_addr_ops;
|
|
|
|
break;
|
|
|
|
case S_IFDIR:
|
2008-03-12 00:07:48 +03:00
|
|
|
#ifdef CONFIG_CIFS_DFS_UPCALL
|
2011-01-14 21:45:47 +03:00
|
|
|
if (IS_AUTOMOUNT(inode)) {
|
2008-03-09 06:44:18 +03:00
|
|
|
inode->i_op = &cifs_dfs_referral_inode_operations;
|
|
|
|
} else {
|
2008-03-12 00:07:48 +03:00
|
|
|
#else /* NO DFS support, treat as a directory */
|
|
|
|
{
|
|
|
|
#endif
|
2008-03-09 06:44:18 +03:00
|
|
|
inode->i_op = &cifs_dir_inode_ops;
|
|
|
|
inode->i_fop = &cifs_dir_ops;
|
|
|
|
}
|
2008-02-15 23:55:05 +03:00
|
|
|
break;
|
|
|
|
case S_IFLNK:
|
|
|
|
inode->i_op = &cifs_symlink_inode_ops;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
init_special_inode(inode, inode->i_mode, inode->i_rdev);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
/* check inode attributes against fattr. If they don't match, tag the
|
|
|
|
* inode for cache invalidation
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr)
|
|
|
|
{
|
|
|
|
struct cifsInodeInfo *cifs_i = CIFS_I(inode);
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
struct timespec ts;
|
2010-02-12 15:44:16 +03:00
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: revalidating inode %llu\n",
|
|
|
|
__func__, cifs_i->uniqueid);
|
2010-02-12 15:44:16 +03:00
|
|
|
|
|
|
|
if (inode->i_state & I_NEW) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: inode %llu is new\n",
|
|
|
|
__func__, cifs_i->uniqueid);
|
2010-02-12 15:44:16 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* don't bother with revalidation if we have an oplock */
|
2013-09-05 13:01:06 +04:00
|
|
|
if (CIFS_CACHE_READ(cifs_i)) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: inode %llu is oplocked\n",
|
|
|
|
__func__, cifs_i->uniqueid);
|
2010-02-12 15:44:16 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* revalidate if mtime or size have changed */
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
ts = timespec64_to_timespec(inode->i_mtime);
|
|
|
|
if (timespec_equal(&ts, &fattr->cf_mtime) &&
|
2010-02-12 15:44:16 +03:00
|
|
|
cifs_i->server_eof == fattr->cf_eof) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: inode %llu is unchanged\n",
|
|
|
|
__func__, cifs_i->uniqueid);
|
2010-02-12 15:44:16 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: invalidating inode %llu mapping\n",
|
|
|
|
__func__, cifs_i->uniqueid);
|
2014-04-30 17:31:45 +04:00
|
|
|
set_bit(CIFS_INO_INVALID_MAPPING, &cifs_i->flags);
|
2010-02-12 15:44:16 +03:00
|
|
|
}
|
|
|
|
|
2013-09-21 19:36:10 +04:00
|
|
|
/*
|
|
|
|
* copy nlink to the inode, unless it wasn't provided. Provide
|
|
|
|
* sane values if we don't have an existing one and none was provided
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
cifs_nlink_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* if we're in a situation where we can't trust what we
|
|
|
|
* got from the server (readdir, some non-unix cases)
|
|
|
|
* fake reasonable values
|
|
|
|
*/
|
|
|
|
if (fattr->cf_flags & CIFS_FATTR_UNKNOWN_NLINK) {
|
|
|
|
/* only provide fake values on a new inode */
|
|
|
|
if (inode->i_state & I_NEW) {
|
|
|
|
if (fattr->cf_cifsattrs & ATTR_DIRECTORY)
|
|
|
|
set_nlink(inode, 2);
|
|
|
|
else
|
|
|
|
set_nlink(inode, 1);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we trust the server, so update it */
|
|
|
|
set_nlink(inode, fattr->cf_nlink);
|
|
|
|
}
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
/* populate an inode with info from a cifs_fattr struct */
|
|
|
|
void
|
|
|
|
cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
|
2008-02-25 23:25:21 +03:00
|
|
|
{
|
2009-06-25 08:56:52 +04:00
|
|
|
struct cifsInodeInfo *cifs_i = CIFS_I(inode);
|
2009-07-09 09:46:37 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2009-06-25 08:56:52 +04:00
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
cifs_revalidate_cache(inode, fattr);
|
|
|
|
|
2012-08-03 17:43:01 +04:00
|
|
|
spin_lock(&inode->i_lock);
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
inode->i_atime = timespec_to_timespec64(fattr->cf_atime);
|
|
|
|
inode->i_mtime = timespec_to_timespec64(fattr->cf_mtime);
|
|
|
|
inode->i_ctime = timespec_to_timespec64(fattr->cf_ctime);
|
2009-06-25 08:56:52 +04:00
|
|
|
inode->i_rdev = fattr->cf_rdev;
|
2013-09-21 19:36:10 +04:00
|
|
|
cifs_nlink_fattr_to_inode(inode, fattr);
|
2009-06-25 08:56:52 +04:00
|
|
|
inode->i_uid = fattr->cf_uid;
|
|
|
|
inode->i_gid = fattr->cf_gid;
|
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/* if dynperm is set, don't clobber existing mode */
|
|
|
|
if (inode->i_state & I_NEW ||
|
|
|
|
!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM))
|
|
|
|
inode->i_mode = fattr->cf_mode;
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
cifs_i->cifsAttrs = fattr->cf_cifsattrs;
|
2008-02-25 23:25:21 +03:00
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
if (fattr->cf_flags & CIFS_FATTR_NEED_REVAL)
|
|
|
|
cifs_i->time = 0;
|
|
|
|
else
|
|
|
|
cifs_i->time = jiffies;
|
|
|
|
|
2014-04-30 17:31:45 +04:00
|
|
|
if (fattr->cf_flags & CIFS_FATTR_DELETE_PENDING)
|
|
|
|
set_bit(CIFS_INO_DELETE_PENDING, &cifs_i->flags);
|
|
|
|
else
|
|
|
|
clear_bit(CIFS_INO_DELETE_PENDING, &cifs_i->flags);
|
2009-06-25 08:56:52 +04:00
|
|
|
|
2010-02-11 00:21:33 +03:00
|
|
|
cifs_i->server_eof = fattr->cf_eof;
|
2009-06-25 08:56:52 +04:00
|
|
|
/*
|
|
|
|
* Can't safely change the file size here if the client is writing to
|
|
|
|
* it due to potential races.
|
|
|
|
*/
|
|
|
|
if (is_size_safe_to_change(cifs_i, fattr->cf_eof)) {
|
|
|
|
i_size_write(inode, fattr->cf_eof);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* i_blocks is not related to (i_size / i_blksize),
|
|
|
|
* but instead 512 byte (2**9) size is required for
|
|
|
|
* calculating num blocks.
|
|
|
|
*/
|
|
|
|
inode->i_blocks = (512 - 1 + fattr->cf_bytes) >> 9;
|
|
|
|
}
|
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
|
2011-01-14 21:45:47 +03:00
|
|
|
if (fattr->cf_flags & CIFS_FATTR_DFS_REFERRAL)
|
|
|
|
inode->i_flags |= S_AUTOMOUNT;
|
2013-05-07 19:28:31 +04:00
|
|
|
if (inode->i_state & I_NEW)
|
|
|
|
cifs_set_ops(inode);
|
2009-06-25 08:56:52 +04:00
|
|
|
}
|
|
|
|
|
2010-05-17 15:18:58 +04:00
|
|
|
void
|
|
|
|
cifs_fill_uniqueid(struct super_block *sb, struct cifs_fattr *fattr)
|
|
|
|
{
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
|
|
|
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
|
|
|
|
return;
|
|
|
|
|
|
|
|
fattr->cf_uniqueid = iunique(sb, ROOT_I);
|
|
|
|
}
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
/* Fill a cifs_fattr struct with info from FILE_UNIX_BASIC_INFO. */
|
|
|
|
void
|
|
|
|
cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, FILE_UNIX_BASIC_INFO *info,
|
|
|
|
struct cifs_sb_info *cifs_sb)
|
|
|
|
{
|
|
|
|
memset(fattr, 0, sizeof(*fattr));
|
|
|
|
fattr->cf_uniqueid = le64_to_cpu(info->UniqueId);
|
|
|
|
fattr->cf_bytes = le64_to_cpu(info->NumOfBytes);
|
|
|
|
fattr->cf_eof = le64_to_cpu(info->EndOfFile);
|
|
|
|
|
|
|
|
fattr->cf_atime = cifs_NTtimeToUnix(info->LastAccessTime);
|
|
|
|
fattr->cf_mtime = cifs_NTtimeToUnix(info->LastModificationTime);
|
|
|
|
fattr->cf_ctime = cifs_NTtimeToUnix(info->LastStatusChange);
|
2017-09-22 05:32:29 +03:00
|
|
|
/* old POSIX extensions don't get create time */
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode = le64_to_cpu(info->Permissions);
|
2008-02-25 23:25:21 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Since we set the inode type below we need to mask off
|
|
|
|
* to avoid strange results if bits set above.
|
|
|
|
*/
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode &= ~S_IFMT;
|
2008-02-25 23:25:21 +03:00
|
|
|
switch (le32_to_cpu(info->Type)) {
|
|
|
|
case UNIX_FILE:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFREG;
|
|
|
|
fattr->cf_dtype = DT_REG;
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_SYMLINK:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFLNK;
|
|
|
|
fattr->cf_dtype = DT_LNK;
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_DIR:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFDIR;
|
|
|
|
fattr->cf_dtype = DT_DIR;
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_CHARDEV:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFCHR;
|
|
|
|
fattr->cf_dtype = DT_CHR;
|
|
|
|
fattr->cf_rdev = MKDEV(le64_to_cpu(info->DevMajor),
|
|
|
|
le64_to_cpu(info->DevMinor) & MINORMASK);
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_BLOCKDEV:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFBLK;
|
|
|
|
fattr->cf_dtype = DT_BLK;
|
|
|
|
fattr->cf_rdev = MKDEV(le64_to_cpu(info->DevMajor),
|
|
|
|
le64_to_cpu(info->DevMinor) & MINORMASK);
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_FIFO:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFIFO;
|
|
|
|
fattr->cf_dtype = DT_FIFO;
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
case UNIX_SOCKET:
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFSOCK;
|
|
|
|
fattr->cf_dtype = DT_SOCK;
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* safest to call it a file if we do not know */
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_mode |= S_IFREG;
|
|
|
|
fattr->cf_dtype = DT_REG;
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "unknown type %d\n", le32_to_cpu(info->Type));
|
2008-02-25 23:25:21 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-02-06 11:55:44 +04:00
|
|
|
fattr->cf_uid = cifs_sb->mnt_uid;
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)) {
|
|
|
|
u64 id = le64_to_cpu(info->Uid);
|
2013-02-06 13:53:25 +04:00
|
|
|
if (id < ((uid_t)-1)) {
|
|
|
|
kuid_t uid = make_kuid(&init_user_ns, id);
|
|
|
|
if (uid_valid(uid))
|
|
|
|
fattr->cf_uid = uid;
|
|
|
|
}
|
2013-02-06 11:55:44 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
fattr->cf_gid = cifs_sb->mnt_gid;
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)) {
|
|
|
|
u64 id = le64_to_cpu(info->Gid);
|
2013-02-06 13:53:25 +04:00
|
|
|
if (id < ((gid_t)-1)) {
|
|
|
|
kgid_t gid = make_kgid(&init_user_ns, id);
|
|
|
|
if (gid_valid(gid))
|
|
|
|
fattr->cf_gid = gid;
|
|
|
|
}
|
2013-02-06 11:55:44 +04:00
|
|
|
}
|
2008-02-25 23:25:21 +03:00
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_nlink = le64_to_cpu(info->Nlinks);
|
2008-02-25 23:25:21 +03:00
|
|
|
}
|
|
|
|
|
2008-05-21 01:52:32 +04:00
|
|
|
/*
|
2009-06-25 08:56:52 +04:00
|
|
|
* Fill a cifs_fattr struct with fake inode info.
|
|
|
|
*
|
|
|
|
* Needed to setup cifs_fattr data for the directory which is the
|
|
|
|
* junction to the new submount (ie to setup the fake directory
|
|
|
|
* which represents a DFS referral).
|
2008-05-21 01:52:32 +04:00
|
|
|
*/
|
2009-07-23 03:13:01 +04:00
|
|
|
static void
|
2009-06-25 08:56:52 +04:00
|
|
|
cifs_create_dfs_fattr(struct cifs_fattr *fattr, struct super_block *sb)
|
2008-05-20 23:50:46 +04:00
|
|
|
{
|
2009-06-25 08:56:52 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
2008-05-20 23:50:46 +04:00
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "creating fake fattr for DFS referral\n");
|
2009-06-25 08:56:52 +04:00
|
|
|
|
|
|
|
memset(fattr, 0, sizeof(*fattr));
|
|
|
|
fattr->cf_mode = S_IFDIR | S_IXUGO | S_IRWXU;
|
|
|
|
fattr->cf_uid = cifs_sb->mnt_uid;
|
|
|
|
fattr->cf_gid = cifs_sb->mnt_gid;
|
2017-05-09 01:59:16 +03:00
|
|
|
ktime_get_real_ts(&fattr->cf_mtime);
|
|
|
|
fattr->cf_mtime = timespec_trunc(fattr->cf_mtime, sb->s_time_gran);
|
|
|
|
fattr->cf_atime = fattr->cf_ctime = fattr->cf_mtime;
|
2009-06-25 08:56:52 +04:00
|
|
|
fattr->cf_nlink = 2;
|
|
|
|
fattr->cf_flags |= CIFS_FATTR_DFS_REFERRAL;
|
2008-05-20 23:50:46 +04:00
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:26 +04:00
|
|
|
static int
|
|
|
|
cifs_get_file_info_unix(struct file *filp)
|
2010-02-12 15:44:18 +03:00
|
|
|
{
|
|
|
|
int rc;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2010-02-12 15:44:18 +03:00
|
|
|
FILE_UNIX_BASIC_INFO find_data;
|
|
|
|
struct cifs_fattr fattr;
|
2013-01-24 02:07:38 +04:00
|
|
|
struct inode *inode = file_inode(filp);
|
2010-02-12 15:44:18 +03:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2010-07-13 00:50:14 +04:00
|
|
|
struct cifsFileInfo *cfile = filp->private_data;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2010-02-12 15:44:18 +03:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2012-09-19 03:20:26 +04:00
|
|
|
rc = CIFSSMBUnixQFileInfo(xid, tcon, cfile->fid.netfid, &find_data);
|
2010-02-12 15:44:18 +03:00
|
|
|
if (!rc) {
|
|
|
|
cifs_unix_basic_to_fattr(&fattr, &find_data, cifs_sb);
|
|
|
|
} else if (rc == -EREMOTE) {
|
|
|
|
cifs_create_dfs_fattr(&fattr, inode->i_sb);
|
|
|
|
rc = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
cifs_fattr_to_inode(inode, &fattr);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-02-12 15:44:18 +03:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
int cifs_get_inode_info_unix(struct inode **pinode,
|
2009-06-25 08:56:52 +04:00
|
|
|
const unsigned char *full_path,
|
2012-06-20 11:21:16 +04:00
|
|
|
struct super_block *sb, unsigned int xid)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2009-06-25 08:56:52 +04:00
|
|
|
int rc;
|
2008-05-20 23:50:46 +04:00
|
|
|
FILE_UNIX_BASIC_INFO find_data;
|
2009-06-25 08:56:52 +04:00
|
|
|
struct cifs_fattr fattr;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "Getting info on %s\n", full_path);
|
2008-03-09 06:44:18 +03:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* could have done a find first instead but this returns more info */
|
2009-06-25 08:56:52 +04:00
|
|
|
rc = CIFSSMBUnixQPathInfo(xid, tcon, full_path, &find_data,
|
2015-02-13 09:35:58 +03:00
|
|
|
cifs_sb->local_nls, cifs_remap(cifs_sb));
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2008-07-13 00:47:59 +04:00
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
if (!rc) {
|
|
|
|
cifs_unix_basic_to_fattr(&fattr, &find_data, cifs_sb);
|
|
|
|
} else if (rc == -EREMOTE) {
|
|
|
|
cifs_create_dfs_fattr(&fattr, sb);
|
|
|
|
rc = 0;
|
|
|
|
} else {
|
|
|
|
return rc;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-08-05 23:19:56 +04:00
|
|
|
/* check for Minshall+French symlinks */
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
2013-11-25 21:09:50 +04:00
|
|
|
int tmprc = check_mf_symlink(xid, tcon, cifs_sb, &fattr,
|
|
|
|
full_path);
|
2010-08-05 23:19:56 +04:00
|
|
|
if (tmprc)
|
2013-11-25 21:09:50 +04:00
|
|
|
cifs_dbg(FYI, "check_mf_symlink: %d\n", tmprc);
|
2010-08-05 23:19:56 +04:00
|
|
|
}
|
|
|
|
|
2008-05-20 23:50:46 +04:00
|
|
|
if (*pinode == NULL) {
|
2009-06-25 08:56:52 +04:00
|
|
|
/* get new inode */
|
2010-05-17 15:18:58 +04:00
|
|
|
cifs_fill_uniqueid(sb, &fattr);
|
2009-06-25 08:56:52 +04:00
|
|
|
*pinode = cifs_iget(sb, &fattr);
|
|
|
|
if (!*pinode)
|
2008-05-20 23:50:46 +04:00
|
|
|
rc = -ENOMEM;
|
2009-06-25 08:56:52 +04:00
|
|
|
} else {
|
|
|
|
/* we already have inode, update it */
|
2015-04-22 09:24:44 +03:00
|
|
|
|
|
|
|
/* if uniqueid is different, return error */
|
|
|
|
if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM &&
|
|
|
|
CIFS_I(*pinode)->uniqueid != fattr.cf_uniqueid)) {
|
|
|
|
rc = -ESTALE;
|
|
|
|
goto cgiiu_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if filetype is different, return error */
|
|
|
|
if (unlikely(((*pinode)->i_mode & S_IFMT) !=
|
|
|
|
(fattr.cf_mode & S_IFMT))) {
|
|
|
|
rc = -ESTALE;
|
|
|
|
goto cgiiu_exit;
|
|
|
|
}
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
cifs_fattr_to_inode(*pinode, &fattr);
|
2008-05-20 23:50:46 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2015-04-22 09:24:44 +03:00
|
|
|
cgiiu_exit:
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
static int
|
2014-01-16 15:53:35 +04:00
|
|
|
cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
|
2012-06-20 11:21:16 +04:00
|
|
|
struct cifs_sb_info *cifs_sb, unsigned int xid)
|
2005-11-16 03:43:39 +03:00
|
|
|
{
|
|
|
|
int rc;
|
2014-09-22 14:13:55 +04:00
|
|
|
__u32 oplock;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2014-01-16 15:53:36 +04:00
|
|
|
struct cifs_fid fid;
|
|
|
|
struct cifs_open_parms oparms;
|
2011-05-26 10:02:00 +04:00
|
|
|
struct cifs_io_parms io_parms;
|
2005-11-19 07:25:31 +03:00
|
|
|
char buf[24];
|
2005-11-16 03:43:39 +03:00
|
|
|
unsigned int bytes_read;
|
2007-07-10 05:16:18 +04:00
|
|
|
char *pbuf;
|
2014-01-16 15:53:35 +04:00
|
|
|
int buf_type = CIFS_NO_BUFFER;
|
2005-11-16 03:43:39 +03:00
|
|
|
|
|
|
|
pbuf = buf;
|
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr->cf_mode &= ~S_IFMT;
|
|
|
|
|
|
|
|
if (fattr->cf_eof == 0) {
|
|
|
|
fattr->cf_mode |= S_IFIFO;
|
|
|
|
fattr->cf_dtype = DT_FIFO;
|
2005-11-16 03:43:39 +03:00
|
|
|
return 0;
|
2009-07-09 09:46:37 +04:00
|
|
|
} else if (fattr->cf_eof < 8) {
|
|
|
|
fattr->cf_mode |= S_IFREG;
|
|
|
|
fattr->cf_dtype = DT_REG;
|
2005-11-16 03:43:39 +03:00
|
|
|
return -EINVAL; /* EOPNOTSUPP? */
|
|
|
|
}
|
2007-07-13 04:33:32 +04:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
|
2014-01-16 15:53:36 +04:00
|
|
|
oparms.tcon = tcon;
|
|
|
|
oparms.cifs_sb = cifs_sb;
|
|
|
|
oparms.desired_access = GENERIC_READ;
|
|
|
|
oparms.create_options = CREATE_NOT_DIR;
|
|
|
|
oparms.disposition = FILE_OPEN;
|
|
|
|
oparms.path = path;
|
|
|
|
oparms.fid = &fid;
|
|
|
|
oparms.reconnect = false;
|
|
|
|
|
2014-09-22 14:13:55 +04:00
|
|
|
if (tcon->ses->server->oplocks)
|
|
|
|
oplock = REQ_OPLOCK;
|
|
|
|
else
|
|
|
|
oplock = 0;
|
|
|
|
rc = tcon->ses->server->ops->open(xid, &oparms, &oplock, NULL);
|
2014-01-16 15:53:35 +04:00
|
|
|
if (rc) {
|
2014-09-22 14:13:55 +04:00
|
|
|
cifs_dbg(FYI, "check sfu type of %s, open rc = %d\n", path, rc);
|
2014-01-16 15:53:35 +04:00
|
|
|
cifs_put_tlink(tlink);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read header */
|
2014-01-16 15:53:36 +04:00
|
|
|
io_parms.netfid = fid.netfid;
|
2014-01-16 15:53:35 +04:00
|
|
|
io_parms.pid = current->tgid;
|
|
|
|
io_parms.tcon = tcon;
|
|
|
|
io_parms.offset = 0;
|
|
|
|
io_parms.length = 24;
|
|
|
|
|
2014-09-22 14:13:55 +04:00
|
|
|
rc = tcon->ses->server->ops->sync_read(xid, &fid, &io_parms,
|
|
|
|
&bytes_read, &pbuf, &buf_type);
|
2014-01-16 15:53:35 +04:00
|
|
|
if ((rc == 0) && (bytes_read >= 8)) {
|
|
|
|
if (memcmp("IntxBLK", pbuf, 8) == 0) {
|
|
|
|
cifs_dbg(FYI, "Block device\n");
|
|
|
|
fattr->cf_mode |= S_IFBLK;
|
|
|
|
fattr->cf_dtype = DT_BLK;
|
|
|
|
if (bytes_read == 24) {
|
|
|
|
/* we have enough to decode dev num */
|
|
|
|
__u64 mjr; /* major */
|
|
|
|
__u64 mnr; /* minor */
|
|
|
|
mjr = le64_to_cpu(*(__le64 *)(pbuf+8));
|
|
|
|
mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
|
|
|
|
fattr->cf_rdev = MKDEV(mjr, mnr);
|
2005-11-19 07:25:31 +03:00
|
|
|
}
|
2014-01-16 15:53:35 +04:00
|
|
|
} else if (memcmp("IntxCHR", pbuf, 8) == 0) {
|
|
|
|
cifs_dbg(FYI, "Char device\n");
|
|
|
|
fattr->cf_mode |= S_IFCHR;
|
|
|
|
fattr->cf_dtype = DT_CHR;
|
|
|
|
if (bytes_read == 24) {
|
|
|
|
/* we have enough to decode dev num */
|
|
|
|
__u64 mjr; /* major */
|
|
|
|
__u64 mnr; /* minor */
|
|
|
|
mjr = le64_to_cpu(*(__le64 *)(pbuf+8));
|
|
|
|
mnr = le64_to_cpu(*(__le64 *)(pbuf+16));
|
|
|
|
fattr->cf_rdev = MKDEV(mjr, mnr);
|
|
|
|
}
|
|
|
|
} else if (memcmp("IntxLNK", pbuf, 7) == 0) {
|
|
|
|
cifs_dbg(FYI, "Symlink\n");
|
|
|
|
fattr->cf_mode |= S_IFLNK;
|
|
|
|
fattr->cf_dtype = DT_LNK;
|
2005-11-18 22:31:10 +03:00
|
|
|
} else {
|
2014-01-16 15:53:35 +04:00
|
|
|
fattr->cf_mode |= S_IFREG; /* file? */
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr->cf_dtype = DT_REG;
|
2014-01-16 15:53:35 +04:00
|
|
|
rc = -EOPNOTSUPP;
|
2007-07-10 05:16:18 +04:00
|
|
|
}
|
2014-01-16 15:53:35 +04:00
|
|
|
} else {
|
|
|
|
fattr->cf_mode |= S_IFREG; /* then it is a file */
|
|
|
|
fattr->cf_dtype = DT_REG;
|
|
|
|
rc = -EOPNOTSUPP; /* or some unknown SFU type */
|
2005-11-16 03:43:39 +03:00
|
|
|
}
|
2014-09-22 14:13:55 +04:00
|
|
|
|
|
|
|
tcon->ses->server->ops->close(xid, tcon, &fid);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-11-16 03:43:39 +03:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-11-18 03:59:21 +03:00
|
|
|
#define SFBITS_MASK (S_ISVTX | S_ISGID | S_ISUID) /* SETFILEBITS valid bits */
|
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/*
|
|
|
|
* Fetch mode bits as provided by SFU.
|
|
|
|
*
|
|
|
|
* FIXME: Doesn't this clobber the type bit we got from cifs_sfu_type ?
|
|
|
|
*/
|
|
|
|
static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path,
|
2012-06-20 11:21:16 +04:00
|
|
|
struct cifs_sb_info *cifs_sb, unsigned int xid)
|
2005-11-18 03:59:21 +03:00
|
|
|
{
|
2005-11-18 22:31:10 +03:00
|
|
|
#ifdef CONFIG_CIFS_XATTR
|
2005-11-18 03:59:21 +03:00
|
|
|
ssize_t rc;
|
|
|
|
char ea_value[4];
|
|
|
|
__u32 mode;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2010-09-30 03:51:11 +04:00
|
|
|
|
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
2005-11-18 03:59:21 +03:00
|
|
|
|
2014-02-02 09:27:18 +04:00
|
|
|
if (tcon->ses->server->ops->query_all_EAs == NULL) {
|
|
|
|
cifs_put_tlink(tlink);
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = tcon->ses->server->ops->query_all_EAs(xid, tcon, path,
|
|
|
|
"SETFILEBITS", ea_value, 4 /* size of buf */,
|
2017-05-13 04:59:10 +03:00
|
|
|
cifs_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2007-05-01 00:13:06 +04:00
|
|
|
if (rc < 0)
|
2005-11-18 03:59:21 +03:00
|
|
|
return (int)rc;
|
|
|
|
else if (rc > 3) {
|
|
|
|
mode = le32_to_cpu(*((__le32 *)ea_value));
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr->cf_mode &= ~SFBITS_MASK;
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "special bits 0%o org mode 0%o\n",
|
|
|
|
mode, fattr->cf_mode);
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr->cf_mode = (mode & SFBITS_MASK) | fattr->cf_mode;
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "special mode bits 0%o\n", mode);
|
2005-11-18 03:59:21 +03:00
|
|
|
}
|
2009-07-09 09:46:37 +04:00
|
|
|
|
|
|
|
return 0;
|
2005-11-18 22:31:10 +03:00
|
|
|
#else
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
#endif
|
2005-11-18 03:59:21 +03:00
|
|
|
}
|
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/* Fill a cifs_fattr struct with info from FILE_ALL_INFO */
|
2009-07-23 03:13:01 +04:00
|
|
|
static void
|
2009-07-09 09:46:37 +04:00
|
|
|
cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info,
|
2017-05-09 01:59:16 +03:00
|
|
|
struct super_block *sb, bool adjust_tz,
|
2013-10-23 17:49:47 +04:00
|
|
|
bool symlink)
|
2008-05-21 01:52:32 +04:00
|
|
|
{
|
2017-05-09 01:59:16 +03:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
|
2010-09-21 03:01:35 +04:00
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
memset(fattr, 0, sizeof(*fattr));
|
|
|
|
fattr->cf_cifsattrs = le32_to_cpu(info->Attributes);
|
|
|
|
if (info->DeletePending)
|
|
|
|
fattr->cf_flags |= CIFS_FATTR_DELETE_PENDING;
|
|
|
|
|
|
|
|
if (info->LastAccessTime)
|
|
|
|
fattr->cf_atime = cifs_NTtimeToUnix(info->LastAccessTime);
|
2017-05-09 01:59:16 +03:00
|
|
|
else {
|
|
|
|
ktime_get_real_ts(&fattr->cf_atime);
|
|
|
|
fattr->cf_atime = timespec_trunc(fattr->cf_atime, sb->s_time_gran);
|
|
|
|
}
|
2009-07-09 09:46:37 +04:00
|
|
|
|
|
|
|
fattr->cf_ctime = cifs_NTtimeToUnix(info->ChangeTime);
|
|
|
|
fattr->cf_mtime = cifs_NTtimeToUnix(info->LastWriteTime);
|
|
|
|
|
|
|
|
if (adjust_tz) {
|
2010-09-21 03:01:35 +04:00
|
|
|
fattr->cf_ctime.tv_sec += tcon->ses->server->timeAdj;
|
|
|
|
fattr->cf_mtime.tv_sec += tcon->ses->server->timeAdj;
|
2009-07-09 09:46:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
fattr->cf_eof = le64_to_cpu(info->EndOfFile);
|
|
|
|
fattr->cf_bytes = le64_to_cpu(info->AllocationSize);
|
2011-01-07 19:30:27 +03:00
|
|
|
fattr->cf_createtime = le64_to_cpu(info->CreationTime);
|
2009-07-09 09:46:37 +04:00
|
|
|
|
2013-09-21 19:36:10 +04:00
|
|
|
fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
|
2013-10-23 17:49:47 +04:00
|
|
|
|
|
|
|
if (symlink) {
|
|
|
|
fattr->cf_mode = S_IFLNK;
|
|
|
|
fattr->cf_dtype = DT_LNK;
|
|
|
|
} else if (fattr->cf_cifsattrs & ATTR_DIRECTORY) {
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr->cf_mode = S_IFDIR | cifs_sb->mnt_dir_mode;
|
|
|
|
fattr->cf_dtype = DT_DIR;
|
2012-02-17 17:13:30 +04:00
|
|
|
/*
|
|
|
|
* Server can return wrong NumberOfLinks value for directories
|
|
|
|
* when Unix extensions are disabled - fake it.
|
|
|
|
*/
|
2013-09-21 19:36:10 +04:00
|
|
|
if (!tcon->unix_ext)
|
|
|
|
fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK;
|
2009-07-09 09:46:37 +04:00
|
|
|
} else {
|
|
|
|
fattr->cf_mode = S_IFREG | cifs_sb->mnt_file_mode;
|
|
|
|
fattr->cf_dtype = DT_REG;
|
|
|
|
|
2009-07-09 09:46:44 +04:00
|
|
|
/* clear write bits if ATTR_READONLY is set */
|
|
|
|
if (fattr->cf_cifsattrs & ATTR_READONLY)
|
|
|
|
fattr->cf_mode &= ~(S_IWUGO);
|
2009-07-09 09:46:37 +04:00
|
|
|
|
2013-09-21 19:36:10 +04:00
|
|
|
/*
|
|
|
|
* Don't accept zero nlink from non-unix servers unless
|
|
|
|
* delete is pending. Instead mark it as unknown.
|
|
|
|
*/
|
|
|
|
if ((fattr->cf_nlink < 1) && !tcon->unix_ext &&
|
|
|
|
!info->DeletePending) {
|
|
|
|
cifs_dbg(1, "bogus file nlink value %u\n",
|
2013-07-04 23:38:48 +04:00
|
|
|
fattr->cf_nlink);
|
2013-09-21 19:36:10 +04:00
|
|
|
fattr->cf_flags |= CIFS_FATTR_UNKNOWN_NLINK;
|
2013-07-04 23:38:48 +04:00
|
|
|
}
|
2012-02-17 17:13:30 +04:00
|
|
|
}
|
2009-07-09 09:46:37 +04:00
|
|
|
|
|
|
|
fattr->cf_uid = cifs_sb->mnt_uid;
|
|
|
|
fattr->cf_gid = cifs_sb->mnt_gid;
|
2008-05-21 01:52:32 +04:00
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:26 +04:00
|
|
|
static int
|
|
|
|
cifs_get_file_info(struct file *filp)
|
2010-02-12 15:44:18 +03:00
|
|
|
{
|
|
|
|
int rc;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2010-02-12 15:44:18 +03:00
|
|
|
FILE_ALL_INFO find_data;
|
|
|
|
struct cifs_fattr fattr;
|
2013-01-24 02:07:38 +04:00
|
|
|
struct inode *inode = file_inode(filp);
|
2010-07-13 00:50:14 +04:00
|
|
|
struct cifsFileInfo *cfile = filp->private_data;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2012-09-19 03:20:26 +04:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
|
|
|
|
|
|
|
if (!server->ops->query_file_info)
|
|
|
|
return -ENOSYS;
|
2010-02-12 15:44:18 +03:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2012-09-19 03:20:26 +04:00
|
|
|
rc = server->ops->query_file_info(xid, tcon, &cfile->fid, &find_data);
|
2011-10-22 14:37:50 +04:00
|
|
|
switch (rc) {
|
|
|
|
case 0:
|
2017-05-09 01:59:16 +03:00
|
|
|
cifs_all_info_to_fattr(&fattr, &find_data, inode->i_sb, false,
|
2013-10-23 17:49:47 +04:00
|
|
|
false);
|
2011-10-22 14:37:50 +04:00
|
|
|
break;
|
|
|
|
case -EREMOTE:
|
|
|
|
cifs_create_dfs_fattr(&fattr, inode->i_sb);
|
|
|
|
rc = 0;
|
|
|
|
break;
|
|
|
|
case -EOPNOTSUPP:
|
|
|
|
case -EINVAL:
|
2010-02-12 15:44:18 +03:00
|
|
|
/*
|
|
|
|
* FIXME: legacy server -- fall back to path-based call?
|
2010-03-09 23:30:42 +03:00
|
|
|
* for now, just skip revalidating and mark inode for
|
|
|
|
* immediate reval.
|
|
|
|
*/
|
2010-02-12 15:44:18 +03:00
|
|
|
rc = 0;
|
|
|
|
CIFS_I(inode)->time = 0;
|
2011-10-22 14:37:50 +04:00
|
|
|
default:
|
2010-02-12 15:44:18 +03:00
|
|
|
goto cgfi_exit;
|
2011-10-22 14:37:50 +04:00
|
|
|
}
|
2010-02-12 15:44:18 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* don't bother with SFU junk here -- just mark inode as needing
|
|
|
|
* revalidation.
|
|
|
|
*/
|
|
|
|
fattr.cf_uniqueid = CIFS_I(inode)->uniqueid;
|
|
|
|
fattr.cf_flags |= CIFS_FATTR_NEED_REVAL;
|
|
|
|
cifs_fattr_to_inode(inode, &fattr);
|
|
|
|
cgfi_exit:
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-02-12 15:44:18 +03:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2018-04-01 02:13:38 +03:00
|
|
|
/* Simple function to return a 64 bit hash of string. Rarely called */
|
|
|
|
static __u64 simple_hashstr(const char *str)
|
|
|
|
{
|
2018-04-05 15:57:11 +03:00
|
|
|
const __u64 hash_mult = 1125899906842597ULL; /* a big enough prime */
|
2018-04-01 02:13:38 +03:00
|
|
|
__u64 hash = 0;
|
|
|
|
|
|
|
|
while (*str)
|
|
|
|
hash = (hash + (__u64) *str++) * hash_mult;
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2012-05-27 17:34:43 +04:00
|
|
|
int
|
|
|
|
cifs_get_inode_info(struct inode **inode, const char *full_path,
|
|
|
|
FILE_ALL_INFO *data, struct super_block *sb, int xid,
|
2014-02-11 00:08:16 +04:00
|
|
|
const struct cifs_fid *fid)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-09-28 21:21:14 +04:00
|
|
|
bool validinum = false;
|
|
|
|
__u16 srchflgs;
|
|
|
|
int rc = 0, tmprc = ENOSYS;
|
2012-05-27 17:34:43 +04:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct TCP_Server_Info *server;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
|
|
|
char *buf = NULL;
|
2012-05-27 17:34:43 +04:00
|
|
|
bool adjust_tz = false;
|
2009-07-09 09:46:37 +04:00
|
|
|
struct cifs_fattr fattr;
|
2012-09-28 21:21:14 +04:00
|
|
|
struct cifs_search_info *srchinf = NULL;
|
2013-10-23 17:49:47 +04:00
|
|
|
bool symlink = false;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
2012-05-27 17:34:43 +04:00
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
server = tcon->ses->server;
|
2010-09-30 03:51:11 +04:00
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "Getting info on %s\n", full_path);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2012-05-27 17:34:43 +04:00
|
|
|
if ((data == NULL) && (*inode != NULL)) {
|
2018-05-23 23:54:27 +03:00
|
|
|
if (CIFS_CACHE_READ(CIFS_I(*inode)) &&
|
|
|
|
CIFS_I(*inode)->time != 0) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "No need to revalidate cached inode sizes\n");
|
2010-09-30 03:51:11 +04:00
|
|
|
goto cgii_exit;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-27 17:34:43 +04:00
|
|
|
/* if inode info is not passed, get it from server */
|
|
|
|
if (data == NULL) {
|
|
|
|
if (!server->ops->query_path_info) {
|
|
|
|
rc = -ENOSYS;
|
|
|
|
goto cgii_exit;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
buf = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL);
|
2010-09-30 03:51:11 +04:00
|
|
|
if (buf == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto cgii_exit;
|
|
|
|
}
|
2012-05-27 17:34:43 +04:00
|
|
|
data = (FILE_ALL_INFO *)buf;
|
|
|
|
rc = server->ops->query_path_info(xid, tcon, cifs_sb, full_path,
|
2013-10-23 17:49:47 +04:00
|
|
|
data, &adjust_tz, &symlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2009-07-09 09:46:37 +04:00
|
|
|
|
|
|
|
if (!rc) {
|
2017-05-09 01:59:16 +03:00
|
|
|
cifs_all_info_to_fattr(&fattr, data, sb, adjust_tz,
|
2013-10-23 17:49:47 +04:00
|
|
|
symlink);
|
2009-07-09 09:46:37 +04:00
|
|
|
} else if (rc == -EREMOTE) {
|
|
|
|
cifs_create_dfs_fattr(&fattr, sb);
|
2008-05-21 01:52:32 +04:00
|
|
|
rc = 0;
|
2012-09-28 21:21:14 +04:00
|
|
|
} else if (rc == -EACCES && backup_cred(cifs_sb)) {
|
|
|
|
srchinf = kzalloc(sizeof(struct cifs_search_info),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (srchinf == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto cgii_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
srchinf->endOfSearch = false;
|
|
|
|
srchinf->info_level = SMB_FIND_FILE_ID_FULL_DIR_INFO;
|
|
|
|
|
|
|
|
srchflgs = CIFS_SEARCH_CLOSE_ALWAYS |
|
|
|
|
CIFS_SEARCH_CLOSE_AT_END |
|
|
|
|
CIFS_SEARCH_BACKUP_SEARCH;
|
|
|
|
|
|
|
|
rc = CIFSFindFirst(xid, tcon, full_path,
|
|
|
|
cifs_sb, NULL, srchflgs, srchinf, false);
|
|
|
|
if (!rc) {
|
|
|
|
data =
|
|
|
|
(FILE_ALL_INFO *)srchinf->srch_entries_start;
|
|
|
|
|
|
|
|
cifs_dir_info_to_fattr(&fattr,
|
|
|
|
(FILE_DIRECTORY_INFO *)data, cifs_sb);
|
|
|
|
fattr.cf_uniqueid = le64_to_cpu(
|
|
|
|
((SEARCH_ID_FULL_DIR_INFO *)data)->UniqueId);
|
|
|
|
validinum = true;
|
|
|
|
|
|
|
|
cifs_buf_release(srchinf->ntwrk_buf_start);
|
|
|
|
}
|
|
|
|
kfree(srchinf);
|
2015-03-31 06:03:06 +03:00
|
|
|
if (rc)
|
|
|
|
goto cgii_exit;
|
2012-09-28 21:21:14 +04:00
|
|
|
} else
|
2008-03-09 06:44:18 +03:00
|
|
|
goto cgii_exit;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/*
|
|
|
|
* If an inode wasn't passed in, then get the inode number
|
|
|
|
*
|
|
|
|
* Is an i_ino of zero legal? Can we use that to check if the server
|
|
|
|
* supports returning inode numbers? Are there other sanity checks we
|
|
|
|
* can use to ensure that the server is really filling in that field?
|
|
|
|
*/
|
2012-05-27 17:34:43 +04:00
|
|
|
if (*inode == NULL) {
|
2008-05-21 01:52:32 +04:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
|
2012-09-28 21:21:14 +04:00
|
|
|
if (validinum == false) {
|
|
|
|
if (server->ops->get_srv_inum)
|
|
|
|
tmprc = server->ops->get_srv_inum(xid,
|
|
|
|
tcon, cifs_sb, full_path,
|
|
|
|
&fattr.cf_uniqueid, data);
|
|
|
|
if (tmprc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "GetSrvInodeNum rc %d\n",
|
|
|
|
tmprc);
|
2012-09-28 21:21:14 +04:00
|
|
|
fattr.cf_uniqueid = iunique(sb, ROOT_I);
|
|
|
|
cifs_autodisable_serverino(cifs_sb);
|
2018-04-01 02:13:38 +03:00
|
|
|
} else if ((fattr.cf_uniqueid == 0) &&
|
|
|
|
strlen(full_path) == 0) {
|
|
|
|
/* some servers ret bad root ino ie 0 */
|
|
|
|
cifs_dbg(FYI, "Invalid (0) inodenum\n");
|
|
|
|
fattr.cf_flags |=
|
|
|
|
CIFS_FATTR_FAKE_ROOT_INO;
|
|
|
|
fattr.cf_uniqueid =
|
|
|
|
simple_hashstr(tcon->treeName);
|
2012-09-28 21:21:14 +04:00
|
|
|
}
|
2009-02-10 15:33:57 +03:00
|
|
|
}
|
2012-09-28 21:21:14 +04:00
|
|
|
} else
|
2009-07-09 09:46:37 +04:00
|
|
|
fattr.cf_uniqueid = iunique(sb, ROOT_I);
|
2015-12-02 17:46:08 +03:00
|
|
|
} else {
|
|
|
|
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) &&
|
|
|
|
validinum == false && server->ops->get_srv_inum) {
|
|
|
|
/*
|
|
|
|
* Pass a NULL tcon to ensure we don't make a round
|
|
|
|
* trip to the server. This only works for SMB2+.
|
|
|
|
*/
|
|
|
|
tmprc = server->ops->get_srv_inum(xid,
|
|
|
|
NULL, cifs_sb, full_path,
|
|
|
|
&fattr.cf_uniqueid, data);
|
|
|
|
if (tmprc)
|
|
|
|
fattr.cf_uniqueid = CIFS_I(*inode)->uniqueid;
|
2018-04-01 02:13:38 +03:00
|
|
|
else if ((fattr.cf_uniqueid == 0) &&
|
|
|
|
strlen(full_path) == 0) {
|
|
|
|
/*
|
|
|
|
* Reuse existing root inode num since
|
|
|
|
* inum zero for root causes ls of . and .. to
|
|
|
|
* not be returned
|
|
|
|
*/
|
|
|
|
cifs_dbg(FYI, "Srv ret 0 inode num for root\n");
|
|
|
|
fattr.cf_uniqueid = CIFS_I(*inode)->uniqueid;
|
|
|
|
}
|
2015-12-02 17:46:08 +03:00
|
|
|
} else
|
|
|
|
fattr.cf_uniqueid = CIFS_I(*inode)->uniqueid;
|
|
|
|
}
|
2008-05-21 01:52:32 +04:00
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/* query for SFU type info if supported and needed */
|
|
|
|
if (fattr.cf_cifsattrs & ATTR_SYSTEM &&
|
|
|
|
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) {
|
|
|
|
tmprc = cifs_sfu_type(&fattr, full_path, cifs_sb, xid);
|
|
|
|
if (tmprc)
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "cifs_sfu_type failed: %d\n", tmprc);
|
2008-05-21 01:52:32 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-12-06 20:52:08 +03:00
|
|
|
#ifdef CONFIG_CIFS_ACL
|
2008-05-21 01:52:32 +04:00
|
|
|
/* fill in 0777 bits from ACL */
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
|
2012-05-27 17:34:43 +04:00
|
|
|
rc = cifs_acl_to_fattr(cifs_sb, &fattr, *inode, full_path, fid);
|
2010-11-27 20:37:26 +03:00
|
|
|
if (rc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: Getting ACL failed with error: %d\n",
|
|
|
|
__func__, rc);
|
2010-11-27 20:37:26 +03:00
|
|
|
goto cgii_exit;
|
|
|
|
}
|
2008-05-21 01:52:32 +04:00
|
|
|
}
|
2010-12-06 20:52:08 +03:00
|
|
|
#endif /* CONFIG_CIFS_ACL */
|
2008-05-21 01:52:32 +04:00
|
|
|
|
2009-07-09 09:46:37 +04:00
|
|
|
/* fill in remaining high mode bits e.g. SUID, VTX */
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)
|
|
|
|
cifs_sfu_mode(&fattr, full_path, cifs_sb, xid);
|
2008-05-21 01:52:32 +04:00
|
|
|
|
2010-08-05 23:19:56 +04:00
|
|
|
/* check for Minshall+French symlinks */
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MF_SYMLINKS) {
|
2013-11-25 21:09:50 +04:00
|
|
|
tmprc = check_mf_symlink(xid, tcon, cifs_sb, &fattr,
|
|
|
|
full_path);
|
2010-08-05 23:19:56 +04:00
|
|
|
if (tmprc)
|
2013-11-25 21:09:50 +04:00
|
|
|
cifs_dbg(FYI, "check_mf_symlink: %d\n", tmprc);
|
2010-08-05 23:19:56 +04:00
|
|
|
}
|
|
|
|
|
2012-05-27 17:34:43 +04:00
|
|
|
if (!*inode) {
|
|
|
|
*inode = cifs_iget(sb, &fattr);
|
|
|
|
if (!*inode)
|
2009-07-09 09:46:37 +04:00
|
|
|
rc = -ENOMEM;
|
|
|
|
} else {
|
2015-04-22 09:24:44 +03:00
|
|
|
/* we already have inode, update it */
|
|
|
|
|
2015-12-02 17:46:08 +03:00
|
|
|
/* if uniqueid is different, return error */
|
|
|
|
if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM &&
|
|
|
|
CIFS_I(*inode)->uniqueid != fattr.cf_uniqueid)) {
|
|
|
|
rc = -ESTALE;
|
|
|
|
goto cgii_exit;
|
|
|
|
}
|
|
|
|
|
2015-04-22 09:24:44 +03:00
|
|
|
/* if filetype is different, return error */
|
|
|
|
if (unlikely(((*inode)->i_mode & S_IFMT) !=
|
|
|
|
(fattr.cf_mode & S_IFMT))) {
|
|
|
|
rc = -ESTALE;
|
|
|
|
goto cgii_exit;
|
|
|
|
}
|
|
|
|
|
2012-05-27 17:34:43 +04:00
|
|
|
cifs_fattr_to_inode(*inode, &fattr);
|
2009-07-09 09:46:37 +04:00
|
|
|
}
|
2008-05-21 01:52:32 +04:00
|
|
|
|
2008-03-09 06:44:18 +03:00
|
|
|
cgii_exit:
|
2018-04-01 02:13:38 +03:00
|
|
|
if ((*inode) && ((*inode)->i_ino == 0))
|
|
|
|
cifs_dbg(FYI, "inode number of zero returned\n");
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(buf);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-09-29 02:28:55 +04:00
|
|
|
static const struct inode_operations cifs_ipc_inode_ops = {
|
|
|
|
.lookup = cifs_lookup,
|
|
|
|
};
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
static int
|
|
|
|
cifs_find_inode(struct inode *inode, void *opaque)
|
|
|
|
{
|
|
|
|
struct cifs_fattr *fattr = (struct cifs_fattr *) opaque;
|
|
|
|
|
2010-07-20 02:00:17 +04:00
|
|
|
/* don't match inode with different uniqueid */
|
2009-06-25 08:56:52 +04:00
|
|
|
if (CIFS_I(inode)->uniqueid != fattr->cf_uniqueid)
|
|
|
|
return 0;
|
|
|
|
|
2011-01-07 19:30:27 +03:00
|
|
|
/* use createtime like an i_generation field */
|
|
|
|
if (CIFS_I(inode)->createtime != fattr->cf_createtime)
|
|
|
|
return 0;
|
|
|
|
|
2010-07-20 02:00:17 +04:00
|
|
|
/* don't match inode of different type */
|
|
|
|
if ((inode->i_mode & S_IFMT) != (fattr->cf_mode & S_IFMT))
|
|
|
|
return 0;
|
|
|
|
|
2010-08-03 01:43:54 +04:00
|
|
|
/* if it's not a directory or has no dentries, then flag it */
|
2012-06-09 21:51:19 +04:00
|
|
|
if (S_ISDIR(inode->i_mode) && !hlist_empty(&inode->i_dentry))
|
2010-05-11 22:59:55 +04:00
|
|
|
fattr->cf_flags |= CIFS_FATTR_INO_COLLISION;
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
cifs_init_inode(struct inode *inode, void *opaque)
|
|
|
|
{
|
|
|
|
struct cifs_fattr *fattr = (struct cifs_fattr *) opaque;
|
|
|
|
|
|
|
|
CIFS_I(inode)->uniqueid = fattr->cf_uniqueid;
|
2011-01-07 19:30:27 +03:00
|
|
|
CIFS_I(inode)->createtime = fattr->cf_createtime;
|
2009-06-25 08:56:52 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-08-03 01:43:54 +04:00
|
|
|
/*
|
|
|
|
* walk dentry list for an inode and report whether it has aliases that
|
|
|
|
* are hashed. We use this to determine if a directory inode can actually
|
|
|
|
* be used.
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
inode_has_hashed_dentries(struct inode *inode)
|
|
|
|
{
|
|
|
|
struct dentry *dentry;
|
|
|
|
|
2011-01-07 09:50:06 +03:00
|
|
|
spin_lock(&inode->i_lock);
|
2014-10-27 02:19:16 +03:00
|
|
|
hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
|
2010-08-03 01:43:54 +04:00
|
|
|
if (!d_unhashed(dentry) || IS_ROOT(dentry)) {
|
2011-01-07 09:50:06 +03:00
|
|
|
spin_unlock(&inode->i_lock);
|
2010-08-03 01:43:54 +04:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2011-01-07 09:50:06 +03:00
|
|
|
spin_unlock(&inode->i_lock);
|
2010-08-03 01:43:54 +04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
/* Given fattrs, get a corresponding inode */
|
|
|
|
struct inode *
|
|
|
|
cifs_iget(struct super_block *sb, struct cifs_fattr *fattr)
|
|
|
|
{
|
|
|
|
unsigned long hash;
|
|
|
|
struct inode *inode;
|
|
|
|
|
2010-05-11 22:59:55 +04:00
|
|
|
retry_iget5_locked:
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "looking for uniqueid=%llu\n", fattr->cf_uniqueid);
|
2009-06-25 08:56:52 +04:00
|
|
|
|
|
|
|
/* hash down to 32-bits on 32-bit arch */
|
|
|
|
hash = cifs_uniqueid_to_ino_t(fattr->cf_uniqueid);
|
|
|
|
|
|
|
|
inode = iget5_locked(sb, hash, cifs_find_inode, cifs_init_inode, fattr);
|
|
|
|
if (inode) {
|
2010-08-03 01:43:54 +04:00
|
|
|
/* was there a potentially problematic inode collision? */
|
2010-05-11 22:59:55 +04:00
|
|
|
if (fattr->cf_flags & CIFS_FATTR_INO_COLLISION) {
|
|
|
|
fattr->cf_flags &= ~CIFS_FATTR_INO_COLLISION;
|
2010-08-03 01:43:54 +04:00
|
|
|
|
|
|
|
if (inode_has_hashed_dentries(inode)) {
|
|
|
|
cifs_autodisable_serverino(CIFS_SB(sb));
|
|
|
|
iput(inode);
|
|
|
|
fattr->cf_uniqueid = iunique(sb, ROOT_I);
|
|
|
|
goto retry_iget5_locked;
|
|
|
|
}
|
2010-05-11 22:59:55 +04:00
|
|
|
}
|
|
|
|
|
2009-06-25 08:56:52 +04:00
|
|
|
cifs_fattr_to_inode(inode, fattr);
|
2017-11-28 00:05:09 +03:00
|
|
|
if (sb->s_flags & SB_NOATIME)
|
2009-06-25 08:56:52 +04:00
|
|
|
inode->i_flags |= S_NOATIME | S_NOCMTIME;
|
|
|
|
if (inode->i_state & I_NEW) {
|
|
|
|
inode->i_ino = hash;
|
2010-07-16 08:31:02 +04:00
|
|
|
#ifdef CONFIG_CIFS_FSCACHE
|
2010-07-05 16:42:45 +04:00
|
|
|
/* initialize per-inode cache cookie pointer */
|
|
|
|
CIFS_I(inode)->fscache = NULL;
|
2010-07-16 08:31:02 +04:00
|
|
|
#endif
|
2009-06-25 08:56:52 +04:00
|
|
|
unlock_new_inode(inode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return inode;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* gets root inode */
|
2011-02-22 08:56:59 +03:00
|
|
|
struct inode *cifs_root_iget(struct super_block *sb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2010-09-21 03:01:35 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
2009-06-25 08:56:52 +04:00
|
|
|
struct inode *inode = NULL;
|
2008-02-07 11:15:33 +03:00
|
|
|
long rc;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
|
2016-05-25 20:59:09 +03:00
|
|
|
char *path = NULL;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH)
|
|
|
|
&& cifs_sb->prepath) {
|
|
|
|
len = strlen(cifs_sb->prepath);
|
|
|
|
path = kzalloc(len + 2 /* leading sep + null */, GFP_KERNEL);
|
|
|
|
if (path == NULL)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
path[0] = '/';
|
|
|
|
memcpy(path+1, cifs_sb->prepath, len);
|
|
|
|
} else {
|
|
|
|
path = kstrdup("", GFP_KERNEL);
|
|
|
|
if (path == NULL)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
}
|
2008-02-07 11:15:33 +03:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2014-10-06 10:01:03 +04:00
|
|
|
if (tcon->unix_ext) {
|
2016-05-25 20:59:09 +03:00
|
|
|
rc = cifs_get_inode_info_unix(&inode, path, sb, xid);
|
2014-10-06 10:01:03 +04:00
|
|
|
/* some servers mistakenly claim POSIX support */
|
|
|
|
if (rc != -EOPNOTSUPP)
|
|
|
|
goto iget_no_retry;
|
|
|
|
cifs_dbg(VFS, "server does not support POSIX extensions");
|
|
|
|
tcon->unix_ext = false;
|
|
|
|
}
|
|
|
|
|
2016-05-25 20:59:09 +03:00
|
|
|
convert_delimiter(path, CIFS_DIR_SEP(cifs_sb));
|
|
|
|
rc = cifs_get_inode_info(&inode, path, NULL, sb, xid, NULL);
|
2009-07-09 09:46:37 +04:00
|
|
|
|
2014-10-06 10:01:03 +04:00
|
|
|
iget_no_retry:
|
2010-11-11 00:06:13 +03:00
|
|
|
if (!inode) {
|
|
|
|
inode = ERR_PTR(rc);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-06-25 08:56:52 +04:00
|
|
|
|
2010-07-16 08:31:02 +04:00
|
|
|
#ifdef CONFIG_CIFS_FSCACHE
|
2010-07-05 16:42:27 +04:00
|
|
|
/* populate tcon->resource_id */
|
2010-09-21 03:01:35 +04:00
|
|
|
tcon->resource_id = CIFS_I(inode)->uniqueid;
|
2010-07-16 08:31:02 +04:00
|
|
|
#endif
|
2010-07-05 16:42:27 +04:00
|
|
|
|
2018-01-24 15:46:10 +03:00
|
|
|
if (rc && tcon->pipe) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "ipc connection - fake read inode\n");
|
2012-08-03 17:43:01 +04:00
|
|
|
spin_lock(&inode->i_lock);
|
2007-09-29 02:28:55 +04:00
|
|
|
inode->i_mode |= S_IFDIR;
|
2011-10-28 16:13:29 +04:00
|
|
|
set_nlink(inode, 2);
|
2007-09-29 02:28:55 +04:00
|
|
|
inode->i_op = &cifs_ipc_inode_ops;
|
|
|
|
inode->i_fop = &simple_dir_operations;
|
|
|
|
inode->i_uid = cifs_sb->mnt_uid;
|
|
|
|
inode->i_gid = cifs_sb->mnt_gid;
|
2012-08-03 17:43:01 +04:00
|
|
|
spin_unlock(&inode->i_lock);
|
2008-08-12 18:14:40 +04:00
|
|
|
} else if (rc) {
|
2008-02-07 11:15:33 +03:00
|
|
|
iget_failed(inode);
|
2010-11-11 00:06:13 +03:00
|
|
|
inode = ERR_PTR(rc);
|
2007-09-29 02:28:55 +04:00
|
|
|
}
|
|
|
|
|
2010-11-11 00:06:13 +03:00
|
|
|
out:
|
2016-05-25 20:59:09 +03:00
|
|
|
kfree(path);
|
2018-03-18 00:06:56 +03:00
|
|
|
free_xid(xid);
|
2008-02-07 11:15:33 +03:00
|
|
|
return inode;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:25 +04:00
|
|
|
int
|
2012-06-20 11:21:16 +04:00
|
|
|
cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid,
|
2012-09-19 03:20:25 +04:00
|
|
|
char *full_path, __u32 dosattr)
|
2008-09-17 03:50:58 +04:00
|
|
|
{
|
|
|
|
bool set_time = false;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2012-09-19 03:20:32 +04:00
|
|
|
struct TCP_Server_Info *server;
|
2008-09-17 03:50:58 +04:00
|
|
|
FILE_BASIC_INFO info_buf;
|
|
|
|
|
2009-02-25 17:19:56 +03:00
|
|
|
if (attrs == NULL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-09-19 03:20:32 +04:00
|
|
|
server = cifs_sb_master_tcon(cifs_sb)->ses->server;
|
|
|
|
if (!server->ops->set_file_info)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
2008-09-17 03:50:58 +04:00
|
|
|
if (attrs->ia_valid & ATTR_ATIME) {
|
|
|
|
set_time = true;
|
|
|
|
info_buf.LastAccessTime =
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
cpu_to_le64(cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_atime)));
|
2008-09-17 03:50:58 +04:00
|
|
|
} else
|
|
|
|
info_buf.LastAccessTime = 0;
|
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_MTIME) {
|
|
|
|
set_time = true;
|
|
|
|
info_buf.LastWriteTime =
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
cpu_to_le64(cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_mtime)));
|
2008-09-17 03:50:58 +04:00
|
|
|
} else
|
|
|
|
info_buf.LastWriteTime = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Samba throws this field away, but windows may actually use it.
|
|
|
|
* Do not set ctime unless other time stamps are changed explicitly
|
|
|
|
* (i.e. by utimes()) since we would then have a mix of client and
|
|
|
|
* server times.
|
|
|
|
*/
|
|
|
|
if (set_time && (attrs->ia_valid & ATTR_CTIME)) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "CIFS - CTIME changed\n");
|
2008-09-17 03:50:58 +04:00
|
|
|
info_buf.ChangeTime =
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
cpu_to_le64(cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_ctime)));
|
2008-09-17 03:50:58 +04:00
|
|
|
} else
|
|
|
|
info_buf.ChangeTime = 0;
|
|
|
|
|
|
|
|
info_buf.CreationTime = 0; /* don't change */
|
|
|
|
info_buf.Attributes = cpu_to_le32(dosattr);
|
|
|
|
|
2012-09-19 03:20:32 +04:00
|
|
|
return server->ops->set_file_info(inode, full_path, &info_buf, xid);
|
2008-09-17 03:50:58 +04:00
|
|
|
}
|
|
|
|
|
2008-09-23 19:48:35 +04:00
|
|
|
/*
|
2012-09-19 03:20:25 +04:00
|
|
|
* Open the given file (if it isn't already), set the DELETE_ON_CLOSE bit
|
2008-09-23 19:48:35 +04:00
|
|
|
* and rename it to a random name that hopefully won't conflict with
|
|
|
|
* anything else.
|
|
|
|
*/
|
2012-09-19 03:20:25 +04:00
|
|
|
int
|
|
|
|
cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
|
|
|
|
const unsigned int xid)
|
2008-09-23 19:48:35 +04:00
|
|
|
{
|
|
|
|
int oplock = 0;
|
|
|
|
int rc;
|
2014-01-16 15:53:36 +04:00
|
|
|
struct cifs_fid fid;
|
|
|
|
struct cifs_open_parms oparms;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2008-09-23 19:48:35 +04:00
|
|
|
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2008-10-20 04:44:19 +04:00
|
|
|
__u32 dosattr, origattr;
|
|
|
|
FILE_BASIC_INFO *info_buf = NULL;
|
2008-09-23 19:48:35 +04:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
|
2013-03-05 23:25:56 +04:00
|
|
|
/*
|
|
|
|
* We cannot rename the file if the server doesn't support
|
|
|
|
* CAP_INFOLEVEL_PASSTHRU
|
|
|
|
*/
|
|
|
|
if (!(tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU)) {
|
|
|
|
rc = -EBUSY;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2014-01-16 15:53:36 +04:00
|
|
|
oparms.tcon = tcon;
|
|
|
|
oparms.cifs_sb = cifs_sb;
|
|
|
|
oparms.desired_access = DELETE | FILE_WRITE_ATTRIBUTES;
|
|
|
|
oparms.create_options = CREATE_NOT_DIR;
|
|
|
|
oparms.disposition = FILE_OPEN;
|
|
|
|
oparms.path = full_path;
|
|
|
|
oparms.fid = &fid;
|
|
|
|
oparms.reconnect = false;
|
|
|
|
|
|
|
|
rc = CIFS_open(xid, &oparms, &oplock, NULL);
|
2008-09-23 19:48:35 +04:00
|
|
|
if (rc != 0)
|
|
|
|
goto out;
|
|
|
|
|
2008-10-20 04:44:19 +04:00
|
|
|
origattr = cifsInode->cifsAttrs;
|
|
|
|
if (origattr == 0)
|
|
|
|
origattr |= ATTR_NORMAL;
|
|
|
|
|
|
|
|
dosattr = origattr & ~ATTR_READONLY;
|
2008-09-23 19:48:35 +04:00
|
|
|
if (dosattr == 0)
|
|
|
|
dosattr |= ATTR_NORMAL;
|
|
|
|
dosattr |= ATTR_HIDDEN;
|
|
|
|
|
2008-10-20 04:44:19 +04:00
|
|
|
/* set ATTR_HIDDEN and clear ATTR_READONLY, but only if needed */
|
|
|
|
if (dosattr != origattr) {
|
|
|
|
info_buf = kzalloc(sizeof(*info_buf), GFP_KERNEL);
|
|
|
|
if (info_buf == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out_close;
|
|
|
|
}
|
|
|
|
info_buf->Attributes = cpu_to_le32(dosattr);
|
2014-01-16 15:53:36 +04:00
|
|
|
rc = CIFSSMBSetFileInfo(xid, tcon, info_buf, fid.netfid,
|
2008-10-20 04:44:19 +04:00
|
|
|
current->tgid);
|
|
|
|
/* although we would like to mark the file hidden
|
|
|
|
if that fails we will still try to rename it */
|
2013-03-05 23:25:55 +04:00
|
|
|
if (!rc)
|
2008-10-20 04:44:19 +04:00
|
|
|
cifsInode->cifsAttrs = dosattr;
|
|
|
|
else
|
|
|
|
dosattr = origattr; /* since not able to change them */
|
2008-09-23 19:48:35 +04:00
|
|
|
}
|
|
|
|
|
2008-10-17 03:27:12 +04:00
|
|
|
/* rename the file */
|
2014-01-16 15:53:36 +04:00
|
|
|
rc = CIFSSMBRenameOpenFile(xid, tcon, fid.netfid, NULL,
|
|
|
|
cifs_sb->local_nls,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_remap(cifs_sb));
|
2008-10-20 04:44:19 +04:00
|
|
|
if (rc != 0) {
|
2013-03-11 17:08:49 +04:00
|
|
|
rc = -EBUSY;
|
2008-10-20 04:44:19 +04:00
|
|
|
goto undo_setattr;
|
|
|
|
}
|
2008-09-23 19:48:35 +04:00
|
|
|
|
2008-10-20 04:44:19 +04:00
|
|
|
/* try to set DELETE_ON_CLOSE */
|
2014-04-30 17:31:45 +04:00
|
|
|
if (!test_bit(CIFS_INO_DELETE_PENDING, &cifsInode->flags)) {
|
2014-01-16 15:53:36 +04:00
|
|
|
rc = CIFSSMBSetFileDisposition(xid, tcon, true, fid.netfid,
|
2008-10-20 04:44:19 +04:00
|
|
|
current->tgid);
|
|
|
|
/*
|
|
|
|
* some samba versions return -ENOENT when we try to set the
|
|
|
|
* file disposition here. Likely a samba bug, but work around
|
|
|
|
* it for now. This means that some cifsXXX files may hang
|
|
|
|
* around after they shouldn't.
|
|
|
|
*
|
|
|
|
* BB: remove this hack after more servers have the fix
|
|
|
|
*/
|
|
|
|
if (rc == -ENOENT)
|
|
|
|
rc = 0;
|
|
|
|
else if (rc != 0) {
|
2013-03-11 17:08:49 +04:00
|
|
|
rc = -EBUSY;
|
2008-10-20 04:44:19 +04:00
|
|
|
goto undo_rename;
|
|
|
|
}
|
2014-04-30 17:31:45 +04:00
|
|
|
set_bit(CIFS_INO_DELETE_PENDING, &cifsInode->flags);
|
2008-10-20 04:44:19 +04:00
|
|
|
}
|
2008-09-24 19:32:59 +04:00
|
|
|
|
2008-09-23 19:48:35 +04:00
|
|
|
out_close:
|
2014-01-16 15:53:36 +04:00
|
|
|
CIFSSMBClose(xid, tcon, fid.netfid);
|
2008-09-23 19:48:35 +04:00
|
|
|
out:
|
2008-10-20 04:44:19 +04:00
|
|
|
kfree(info_buf);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2008-09-23 19:48:35 +04:00
|
|
|
return rc;
|
2008-10-20 04:44:19 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* reset everything back to the original state. Don't bother
|
|
|
|
* dealing with errors here since we can't do anything about
|
|
|
|
* them anyway.
|
|
|
|
*/
|
|
|
|
undo_rename:
|
2014-01-16 15:53:36 +04:00
|
|
|
CIFSSMBRenameOpenFile(xid, tcon, fid.netfid, dentry->d_name.name,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_sb->local_nls, cifs_remap(cifs_sb));
|
2008-10-20 04:44:19 +04:00
|
|
|
undo_setattr:
|
|
|
|
if (dosattr != origattr) {
|
|
|
|
info_buf->Attributes = cpu_to_le32(origattr);
|
2014-01-16 15:53:36 +04:00
|
|
|
if (!CIFSSMBSetFileInfo(xid, tcon, info_buf, fid.netfid,
|
2008-10-20 04:44:19 +04:00
|
|
|
current->tgid))
|
|
|
|
cifsInode->cifsAttrs = origattr;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto out_close;
|
2008-09-23 19:48:35 +04:00
|
|
|
}
|
|
|
|
|
2012-08-03 17:43:01 +04:00
|
|
|
/* copied from fs/nfs/dir.c with small changes */
|
|
|
|
static void
|
|
|
|
cifs_drop_nlink(struct inode *inode)
|
|
|
|
{
|
|
|
|
spin_lock(&inode->i_lock);
|
|
|
|
if (inode->i_nlink > 0)
|
|
|
|
drop_nlink(inode);
|
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
}
|
2009-04-20 23:45:13 +04:00
|
|
|
|
|
|
|
/*
|
2015-03-18 01:25:59 +03:00
|
|
|
* If d_inode(dentry) is null (usually meaning the cached dentry
|
2009-04-20 23:45:13 +04:00
|
|
|
* is a negative dentry) then we would attempt a standard SMB delete, but
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 18:09:05 +03:00
|
|
|
* if that fails we can not attempt the fall back mechanisms on EACCESS
|
|
|
|
* but will return the EACCESS to the caller. Note that the VFS does not call
|
2009-04-20 23:45:13 +04:00
|
|
|
* unlink on negative dentries currently.
|
|
|
|
*/
|
2008-09-16 22:05:16 +04:00
|
|
|
int cifs_unlink(struct inode *dir, struct dentry *dentry)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
int rc = 0;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2005-04-17 02:20:36 +04:00
|
|
|
char *full_path = NULL;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2009-04-20 23:45:13 +04:00
|
|
|
struct cifsInodeInfo *cifs_inode;
|
2008-09-16 22:05:16 +04:00
|
|
|
struct super_block *sb = dir->i_sb;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2012-09-19 03:20:25 +04:00
|
|
|
struct TCP_Server_Info *server;
|
2008-10-07 22:42:52 +04:00
|
|
|
struct iattr *attrs = NULL;
|
|
|
|
__u32 dosattr = 0, origattr = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "cifs_unlink, dir=0x%p, dentry=0x%p\n", dir, dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
2012-09-19 03:20:25 +04:00
|
|
|
server = tcon->ses->server;
|
2010-09-30 03:51:11 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-09-16 22:05:16 +04:00
|
|
|
/* Unlink can be called from rename so we can not take the
|
|
|
|
* sb->s_vfs_rename_mutex here */
|
|
|
|
full_path = build_path_from_dentry(dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 16:42:34 +04:00
|
|
|
rc = -ENOMEM;
|
2010-09-30 03:51:11 +04:00
|
|
|
goto unlink_out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-07-15 05:48:57 +04:00
|
|
|
|
2012-07-13 13:58:14 +04:00
|
|
|
if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
|
|
|
|
le64_to_cpu(tcon->fsUnixInfo.Capability))) {
|
2008-09-16 22:05:16 +04:00
|
|
|
rc = CIFSPOSIXDelFile(xid, tcon, full_path,
|
2007-07-15 05:48:57 +04:00
|
|
|
SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb->local_nls,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_remap(cifs_sb));
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "posix del rc %d\n", rc);
|
2007-07-15 05:48:57 +04:00
|
|
|
if ((rc == 0) || (rc == -ENOENT))
|
|
|
|
goto psx_del_no_retry;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2008-10-07 22:42:52 +04:00
|
|
|
retry_std_delete:
|
2012-09-19 03:20:25 +04:00
|
|
|
if (!server->ops->unlink) {
|
|
|
|
rc = -ENOSYS;
|
|
|
|
goto psx_del_no_retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = server->ops->unlink(xid, tcon, full_path, cifs_sb);
|
2008-10-07 22:42:52 +04:00
|
|
|
|
2007-07-15 05:48:57 +04:00
|
|
|
psx_del_no_retry:
|
2005-04-17 02:20:36 +04:00
|
|
|
if (!rc) {
|
2008-09-16 22:05:16 +04:00
|
|
|
if (inode)
|
2012-08-03 17:43:01 +04:00
|
|
|
cifs_drop_nlink(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
} else if (rc == -ENOENT) {
|
2008-09-16 22:05:16 +04:00
|
|
|
d_drop(dentry);
|
2013-03-11 17:08:49 +04:00
|
|
|
} else if (rc == -EBUSY) {
|
2012-09-19 03:20:25 +04:00
|
|
|
if (server->ops->rename_pending_delete) {
|
|
|
|
rc = server->ops->rename_pending_delete(full_path,
|
|
|
|
dentry, xid);
|
|
|
|
if (rc == 0)
|
|
|
|
cifs_drop_nlink(inode);
|
|
|
|
}
|
2009-04-20 23:45:13 +04:00
|
|
|
} else if ((rc == -EACCES) && (dosattr == 0) && inode) {
|
2008-09-17 03:50:58 +04:00
|
|
|
attrs = kzalloc(sizeof(*attrs), GFP_KERNEL);
|
|
|
|
if (attrs == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out_reval;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-09-17 03:50:58 +04:00
|
|
|
|
|
|
|
/* try to reset dos attributes */
|
2009-04-20 23:45:13 +04:00
|
|
|
cifs_inode = CIFS_I(inode);
|
|
|
|
origattr = cifs_inode->cifsAttrs;
|
2008-10-07 22:42:52 +04:00
|
|
|
if (origattr == 0)
|
|
|
|
origattr |= ATTR_NORMAL;
|
|
|
|
dosattr = origattr & ~ATTR_READONLY;
|
2008-09-17 03:50:58 +04:00
|
|
|
if (dosattr == 0)
|
|
|
|
dosattr |= ATTR_NORMAL;
|
|
|
|
dosattr |= ATTR_HIDDEN;
|
|
|
|
|
|
|
|
rc = cifs_set_file_info(inode, attrs, xid, full_path, dosattr);
|
|
|
|
if (rc != 0)
|
|
|
|
goto out_reval;
|
2008-10-07 22:42:52 +04:00
|
|
|
|
|
|
|
goto retry_std_delete;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-10-07 22:42:52 +04:00
|
|
|
|
|
|
|
/* undo the setattr if we errored out and it's needed */
|
|
|
|
if (rc != 0 && dosattr != 0)
|
|
|
|
cifs_set_file_info(inode, attrs, xid, full_path, origattr);
|
|
|
|
|
2008-09-17 03:50:58 +04:00
|
|
|
out_reval:
|
2007-05-01 00:13:06 +04:00
|
|
|
if (inode) {
|
2009-04-20 23:45:13 +04:00
|
|
|
cifs_inode = CIFS_I(inode);
|
|
|
|
cifs_inode->time = 0; /* will force revalidate to get info
|
2008-09-16 22:05:16 +04:00
|
|
|
when needed */
|
2017-05-09 01:59:16 +03:00
|
|
|
inode->i_ctime = current_time(inode);
|
2006-04-01 02:43:50 +04:00
|
|
|
}
|
2017-05-09 01:59:16 +03:00
|
|
|
dir->i_ctime = dir->i_mtime = current_time(dir);
|
2009-04-20 23:45:13 +04:00
|
|
|
cifs_inode = CIFS_I(dir);
|
2008-10-07 22:42:52 +04:00
|
|
|
CIFS_I(dir)->time = 0; /* force revalidate of dir as well */
|
2010-09-30 03:51:11 +04:00
|
|
|
unlink_out:
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(full_path);
|
2008-10-07 22:42:52 +04:00
|
|
|
kfree(attrs);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-07-13 14:04:46 +04:00
|
|
|
static int
|
2012-09-19 17:22:45 +04:00
|
|
|
cifs_mkdir_qinfo(struct inode *parent, struct dentry *dentry, umode_t mode,
|
2012-07-13 14:04:46 +04:00
|
|
|
const char *full_path, struct cifs_sb_info *cifs_sb,
|
|
|
|
struct cifs_tcon *tcon, const unsigned int xid)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
2012-09-19 17:22:45 +04:00
|
|
|
struct inode *inode = NULL;
|
2012-07-13 14:04:46 +04:00
|
|
|
|
|
|
|
if (tcon->unix_ext)
|
2012-09-19 17:22:45 +04:00
|
|
|
rc = cifs_get_inode_info_unix(&inode, full_path, parent->i_sb,
|
2012-07-13 14:04:46 +04:00
|
|
|
xid);
|
|
|
|
else
|
2012-09-19 17:22:45 +04:00
|
|
|
rc = cifs_get_inode_info(&inode, full_path, NULL, parent->i_sb,
|
|
|
|
xid, NULL);
|
|
|
|
|
2012-07-13 14:04:46 +04:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* setting nlink not necessary except in cases where we failed to get it
|
2012-09-19 17:22:45 +04:00
|
|
|
* from the server or was set bogus. Also, since this is a brand new
|
|
|
|
* inode, no need to grab the i_lock before setting the i_nlink.
|
2012-07-13 14:04:46 +04:00
|
|
|
*/
|
2012-09-19 17:22:45 +04:00
|
|
|
if (inode->i_nlink < 2)
|
|
|
|
set_nlink(inode, 2);
|
2012-07-13 14:04:46 +04:00
|
|
|
mode &= ~current_umask();
|
|
|
|
/* must turn on setgid bit if parent dir has it */
|
2012-09-19 17:22:45 +04:00
|
|
|
if (parent->i_mode & S_ISGID)
|
2012-07-13 14:04:46 +04:00
|
|
|
mode |= S_ISGID;
|
|
|
|
|
|
|
|
if (tcon->unix_ext) {
|
|
|
|
struct cifs_unix_set_info_args args = {
|
|
|
|
.mode = mode,
|
|
|
|
.ctime = NO_CHANGE_64,
|
|
|
|
.atime = NO_CHANGE_64,
|
|
|
|
.mtime = NO_CHANGE_64,
|
|
|
|
.device = 0,
|
|
|
|
};
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
|
2013-02-06 12:57:56 +04:00
|
|
|
args.uid = current_fsuid();
|
2012-09-19 17:22:45 +04:00
|
|
|
if (parent->i_mode & S_ISGID)
|
2013-02-06 12:57:56 +04:00
|
|
|
args.gid = parent->i_gid;
|
2012-07-13 14:04:46 +04:00
|
|
|
else
|
2013-02-06 12:57:56 +04:00
|
|
|
args.gid = current_fsgid();
|
2012-07-13 14:04:46 +04:00
|
|
|
} else {
|
2013-02-06 12:57:56 +04:00
|
|
|
args.uid = INVALID_UID; /* no change */
|
|
|
|
args.gid = INVALID_GID; /* no change */
|
2012-07-13 14:04:46 +04:00
|
|
|
}
|
|
|
|
CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
|
|
|
|
cifs_sb->local_nls,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_remap(cifs_sb));
|
2012-07-13 14:04:46 +04:00
|
|
|
} else {
|
2012-03-17 12:41:12 +04:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2012-07-13 14:04:46 +04:00
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
|
2012-03-17 12:41:12 +04:00
|
|
|
(mode & S_IWUGO) == 0 && server->ops->mkdir_setinfo)
|
2012-09-19 17:22:45 +04:00
|
|
|
server->ops->mkdir_setinfo(inode, full_path, cifs_sb,
|
2012-03-17 12:41:12 +04:00
|
|
|
tcon, xid);
|
2012-09-19 17:22:45 +04:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)
|
|
|
|
inode->i_mode = (mode | S_IFDIR);
|
|
|
|
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
|
|
|
|
inode->i_uid = current_fsuid();
|
|
|
|
if (inode->i_mode & S_ISGID)
|
|
|
|
inode->i_gid = parent->i_gid;
|
|
|
|
else
|
|
|
|
inode->i_gid = current_fsgid();
|
2012-07-13 14:04:46 +04:00
|
|
|
}
|
|
|
|
}
|
2012-09-19 17:22:45 +04:00
|
|
|
d_instantiate(dentry, inode);
|
2012-07-13 14:04:46 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
|
|
|
|
const char *full_path, struct cifs_sb_info *cifs_sb,
|
|
|
|
struct cifs_tcon *tcon, const unsigned int xid)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
u32 oplock = 0;
|
|
|
|
FILE_UNIX_BASIC_INFO *info = NULL;
|
|
|
|
struct inode *newinode = NULL;
|
|
|
|
struct cifs_fattr fattr;
|
|
|
|
|
|
|
|
info = kzalloc(sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);
|
|
|
|
if (info == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto posix_mkdir_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
mode &= ~current_umask();
|
|
|
|
rc = CIFSPOSIXCreate(xid, tcon, SMB_O_DIRECTORY | SMB_O_CREAT, mode,
|
|
|
|
NULL /* netfid */, info, &oplock, full_path,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_sb->local_nls, cifs_remap(cifs_sb));
|
2012-07-13 14:04:46 +04:00
|
|
|
if (rc == -EOPNOTSUPP)
|
|
|
|
goto posix_mkdir_out;
|
|
|
|
else if (rc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "posix mkdir returned 0x%x\n", rc);
|
2012-07-13 14:04:46 +04:00
|
|
|
d_drop(dentry);
|
|
|
|
goto posix_mkdir_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info->Type == cpu_to_le32(-1))
|
|
|
|
/* no return info, go query for it */
|
|
|
|
goto posix_mkdir_get_info;
|
|
|
|
/*
|
|
|
|
* BB check (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID ) to see if
|
|
|
|
* need to set uid/gid.
|
|
|
|
*/
|
|
|
|
|
|
|
|
cifs_unix_basic_to_fattr(&fattr, info, cifs_sb);
|
|
|
|
cifs_fill_uniqueid(inode->i_sb, &fattr);
|
|
|
|
newinode = cifs_iget(inode->i_sb, &fattr);
|
|
|
|
if (!newinode)
|
|
|
|
goto posix_mkdir_get_info;
|
|
|
|
|
|
|
|
d_instantiate(dentry, newinode);
|
|
|
|
|
|
|
|
#ifdef CONFIG_CIFS_DEBUG2
|
2014-08-20 04:25:34 +04:00
|
|
|
cifs_dbg(FYI, "instantiated dentry %p %pd to inode %p\n",
|
|
|
|
dentry, dentry, newinode);
|
2012-07-13 14:04:46 +04:00
|
|
|
|
|
|
|
if (newinode->i_nlink != 2)
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "unexpected number of links %d\n",
|
|
|
|
newinode->i_nlink);
|
2012-07-13 14:04:46 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
posix_mkdir_out:
|
|
|
|
kfree(info);
|
|
|
|
return rc;
|
|
|
|
posix_mkdir_get_info:
|
|
|
|
rc = cifs_mkdir_qinfo(inode, dentry, mode, full_path, cifs_sb, tcon,
|
|
|
|
xid);
|
|
|
|
goto posix_mkdir_out;
|
|
|
|
}
|
|
|
|
|
2011-07-26 09:41:39 +04:00
|
|
|
int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-07-13 14:04:46 +04:00
|
|
|
int rc = 0;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2012-07-13 13:58:14 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2012-03-17 12:41:12 +04:00
|
|
|
struct TCP_Server_Info *server;
|
2012-07-13 14:04:46 +04:00
|
|
|
char *full_path;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "In cifs_mkdir, mode = 0x%hx inode = 0x%p\n",
|
|
|
|
mode, inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
cifs_sb = CIFS_SB(inode->i_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
2012-07-13 13:58:14 +04:00
|
|
|
tcon = tlink_tcon(tlink);
|
2010-09-30 03:51:11 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-08-30 22:32:14 +04:00
|
|
|
full_path = build_path_from_dentry(direntry);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 16:42:34 +04:00
|
|
|
rc = -ENOMEM;
|
2010-09-30 03:51:11 +04:00
|
|
|
goto mkdir_out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-07-13 04:33:32 +04:00
|
|
|
|
2018-06-15 05:56:32 +03:00
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
#ifdef CONFIG_CIFS_SMB311
|
|
|
|
if ((server->ops->posix_mkdir) && (tcon->posix_extensions)) {
|
|
|
|
rc = server->ops->posix_mkdir(xid, inode, mode, tcon, full_path,
|
|
|
|
cifs_sb);
|
|
|
|
d_drop(direntry); /* for time being always refresh inode info */
|
|
|
|
goto mkdir_out;
|
|
|
|
}
|
|
|
|
#endif /* SMB311 */
|
|
|
|
|
2012-07-13 13:58:14 +04:00
|
|
|
if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
|
|
|
|
le64_to_cpu(tcon->fsUnixInfo.Capability))) {
|
2012-07-13 14:04:46 +04:00
|
|
|
rc = cifs_posix_mkdir(inode, direntry, mode, full_path, cifs_sb,
|
|
|
|
tcon, xid);
|
|
|
|
if (rc != -EOPNOTSUPP)
|
2007-04-24 02:07:35 +04:00
|
|
|
goto mkdir_out;
|
2007-07-10 05:16:18 +04:00
|
|
|
}
|
2012-07-13 14:04:46 +04:00
|
|
|
|
2012-03-17 12:41:12 +04:00
|
|
|
if (!server->ops->mkdir) {
|
|
|
|
rc = -ENOSYS;
|
|
|
|
goto mkdir_out;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* BB add setting the equivalent of mode via CreateX w/ACLs */
|
2012-03-17 12:41:12 +04:00
|
|
|
rc = server->ops->mkdir(xid, tcon, full_path, cifs_sb);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (rc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "cifs_mkdir returned 0x%x\n", rc);
|
2005-04-17 02:20:36 +04:00
|
|
|
d_drop(direntry);
|
2012-07-13 14:04:46 +04:00
|
|
|
goto mkdir_out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2012-07-13 14:04:46 +04:00
|
|
|
|
|
|
|
rc = cifs_mkdir_qinfo(inode, direntry, mode, full_path, cifs_sb, tcon,
|
|
|
|
xid);
|
2007-07-10 05:16:18 +04:00
|
|
|
mkdir_out:
|
2012-02-17 17:13:30 +04:00
|
|
|
/*
|
|
|
|
* Force revalidate to get parent dir info when needed since cached
|
|
|
|
* attributes are invalid now.
|
|
|
|
*/
|
|
|
|
CIFS_I(inode)->time = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(full_path);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cifs_rmdir(struct inode *inode, struct dentry *direntry)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2012-07-10 16:14:18 +04:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct TCP_Server_Info *server;
|
2005-04-17 02:20:36 +04:00
|
|
|
char *full_path = NULL;
|
|
|
|
struct cifsInodeInfo *cifsInode;
|
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "cifs_rmdir, inode = 0x%p\n", inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-08-30 22:32:14 +04:00
|
|
|
full_path = build_path_from_dentry(direntry);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 16:42:34 +04:00
|
|
|
rc = -ENOMEM;
|
2010-09-30 03:51:11 +04:00
|
|
|
goto rmdir_exit;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_sb = CIFS_SB(inode->i_sb);
|
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink)) {
|
|
|
|
rc = PTR_ERR(tlink);
|
|
|
|
goto rmdir_exit;
|
|
|
|
}
|
2012-07-10 16:14:18 +04:00
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
if (!server->ops->rmdir) {
|
|
|
|
rc = -ENOSYS;
|
|
|
|
cifs_put_tlink(tlink);
|
|
|
|
goto rmdir_exit;
|
|
|
|
}
|
2010-09-30 03:51:11 +04:00
|
|
|
|
2012-07-10 16:14:18 +04:00
|
|
|
rc = server->ops->rmdir(xid, tcon, full_path, cifs_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
if (!rc) {
|
2015-03-18 01:25:59 +03:00
|
|
|
spin_lock(&d_inode(direntry)->i_lock);
|
|
|
|
i_size_write(d_inode(direntry), 0);
|
|
|
|
clear_nlink(d_inode(direntry));
|
|
|
|
spin_unlock(&d_inode(direntry)->i_lock);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2015-03-18 01:25:59 +03:00
|
|
|
cifsInode = CIFS_I(d_inode(direntry));
|
2012-02-17 17:13:30 +04:00
|
|
|
/* force revalidate to go get info when needed */
|
|
|
|
cifsInode->time = 0;
|
2009-01-14 01:03:55 +03:00
|
|
|
|
|
|
|
cifsInode = CIFS_I(inode);
|
2012-02-17 17:13:30 +04:00
|
|
|
/*
|
|
|
|
* Force revalidate to get parent dir info when needed since cached
|
|
|
|
* attributes are invalid now.
|
|
|
|
*/
|
|
|
|
cifsInode->time = 0;
|
2009-01-14 01:03:55 +03:00
|
|
|
|
2015-03-18 01:25:59 +03:00
|
|
|
d_inode(direntry)->i_ctime = inode->i_ctime = inode->i_mtime =
|
2017-05-09 01:59:16 +03:00
|
|
|
current_time(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
rmdir_exit:
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(full_path);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-09-23 22:23:33 +04:00
|
|
|
static int
|
2012-09-19 03:20:30 +04:00
|
|
|
cifs_do_rename(const unsigned int xid, struct dentry *from_dentry,
|
|
|
|
const char *from_path, struct dentry *to_dentry,
|
|
|
|
const char *to_path)
|
2008-09-23 22:23:33 +04:00
|
|
|
{
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(from_dentry->d_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2012-09-19 03:20:30 +04:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct TCP_Server_Info *server;
|
2014-01-16 15:53:36 +04:00
|
|
|
struct cifs_fid fid;
|
|
|
|
struct cifs_open_parms oparms;
|
2008-09-23 22:23:33 +04:00
|
|
|
int oplock, rc;
|
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
2012-09-19 03:20:30 +04:00
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
if (!server->ops->rename)
|
|
|
|
return -ENOSYS;
|
2010-09-30 03:51:11 +04:00
|
|
|
|
2008-09-23 22:23:33 +04:00
|
|
|
/* try path-based rename first */
|
2012-09-19 03:20:30 +04:00
|
|
|
rc = server->ops->rename(xid, tcon, from_path, to_path, cifs_sb);
|
2008-09-23 22:23:33 +04:00
|
|
|
|
|
|
|
/*
|
2012-09-19 03:20:30 +04:00
|
|
|
* Don't bother with rename by filehandle unless file is busy and
|
|
|
|
* source. Note that cross directory moves do not work with
|
2008-09-23 22:23:33 +04:00
|
|
|
* rename by filehandle to various Windows servers.
|
|
|
|
*/
|
2013-03-11 17:08:49 +04:00
|
|
|
if (rc == 0 || rc != -EBUSY)
|
2010-09-30 03:51:11 +04:00
|
|
|
goto do_rename_exit;
|
2008-09-23 22:23:33 +04:00
|
|
|
|
2010-06-02 00:21:01 +04:00
|
|
|
/* open-file renames don't work across directories */
|
|
|
|
if (to_dentry->d_parent != from_dentry->d_parent)
|
2010-09-30 03:51:11 +04:00
|
|
|
goto do_rename_exit;
|
2010-06-02 00:21:01 +04:00
|
|
|
|
2014-01-16 15:53:36 +04:00
|
|
|
oparms.tcon = tcon;
|
|
|
|
oparms.cifs_sb = cifs_sb;
|
2008-09-23 22:23:33 +04:00
|
|
|
/* open the file to be renamed -- we need DELETE perms */
|
2014-01-16 15:53:36 +04:00
|
|
|
oparms.desired_access = DELETE;
|
|
|
|
oparms.create_options = CREATE_NOT_DIR;
|
|
|
|
oparms.disposition = FILE_OPEN;
|
|
|
|
oparms.path = from_path;
|
|
|
|
oparms.fid = &fid;
|
|
|
|
oparms.reconnect = false;
|
|
|
|
|
|
|
|
rc = CIFS_open(xid, &oparms, &oplock, NULL);
|
2008-09-23 22:23:33 +04:00
|
|
|
if (rc == 0) {
|
2014-01-16 15:53:36 +04:00
|
|
|
rc = CIFSSMBRenameOpenFile(xid, tcon, fid.netfid,
|
2008-09-23 22:23:33 +04:00
|
|
|
(const char *) to_dentry->d_name.name,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_sb->local_nls, cifs_remap(cifs_sb));
|
2014-01-16 15:53:36 +04:00
|
|
|
CIFSSMBClose(xid, tcon, fid.netfid);
|
2008-09-23 22:23:33 +04:00
|
|
|
}
|
2010-09-30 03:51:11 +04:00
|
|
|
do_rename_exit:
|
|
|
|
cifs_put_tlink(tlink);
|
2008-09-23 22:23:33 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:30 +04:00
|
|
|
int
|
2014-07-23 17:15:36 +04:00
|
|
|
cifs_rename2(struct inode *source_dir, struct dentry *source_dentry,
|
|
|
|
struct inode *target_dir, struct dentry *target_dentry,
|
|
|
|
unsigned int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-09-19 03:20:30 +04:00
|
|
|
char *from_name = NULL;
|
|
|
|
char *to_name = NULL;
|
2010-09-03 19:50:09 +04:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon;
|
2008-09-23 22:23:33 +04:00
|
|
|
FILE_UNIX_BASIC_INFO *info_buf_source = NULL;
|
|
|
|
FILE_UNIX_BASIC_INFO *info_buf_target;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
|
|
|
int rc, tmprc;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-07-23 17:15:36 +04:00
|
|
|
if (flags & ~RENAME_NOREPLACE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2010-09-03 19:50:09 +04:00
|
|
|
cifs_sb = CIFS_SB(source_dir->i_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2008-09-23 22:23:33 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we already have the rename sem so we do not need to
|
|
|
|
* grab it again here to protect the path integrity
|
|
|
|
*/
|
2012-09-19 03:20:30 +04:00
|
|
|
from_name = build_path_from_dentry(source_dentry);
|
|
|
|
if (from_name == NULL) {
|
2008-09-23 22:23:33 +04:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto cifs_rename_exit;
|
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:30 +04:00
|
|
|
to_name = build_path_from_dentry(target_dentry);
|
|
|
|
if (to_name == NULL) {
|
2005-04-17 02:20:36 +04:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto cifs_rename_exit;
|
|
|
|
}
|
|
|
|
|
2012-09-19 03:20:30 +04:00
|
|
|
rc = cifs_do_rename(xid, source_dentry, from_name, target_dentry,
|
|
|
|
to_name);
|
2008-09-23 22:23:33 +04:00
|
|
|
|
2014-07-23 17:15:36 +04:00
|
|
|
/*
|
|
|
|
* No-replace is the natural behavior for CIFS, so skip unlink hacks.
|
|
|
|
*/
|
|
|
|
if (flags & RENAME_NOREPLACE)
|
|
|
|
goto cifs_rename_exit;
|
|
|
|
|
2008-10-20 22:45:22 +04:00
|
|
|
if (rc == -EEXIST && tcon->unix_ext) {
|
|
|
|
/*
|
2012-09-19 03:20:30 +04:00
|
|
|
* Are src and dst hardlinks of same inode? We can only tell
|
|
|
|
* with unix extensions enabled.
|
2008-10-20 22:45:22 +04:00
|
|
|
*/
|
|
|
|
info_buf_source =
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 23:55:00 +03:00
|
|
|
kmalloc_array(2, sizeof(FILE_UNIX_BASIC_INFO),
|
2008-10-20 22:45:22 +04:00
|
|
|
GFP_KERNEL);
|
|
|
|
if (info_buf_source == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto cifs_rename_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
info_buf_target = info_buf_source + 1;
|
2012-09-19 03:20:30 +04:00
|
|
|
tmprc = CIFSSMBUnixQPathInfo(xid, tcon, from_name,
|
|
|
|
info_buf_source,
|
|
|
|
cifs_sb->local_nls,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_remap(cifs_sb));
|
2008-10-22 21:57:01 +04:00
|
|
|
if (tmprc != 0)
|
2008-10-20 22:45:22 +04:00
|
|
|
goto unlink_target;
|
2008-09-23 22:23:33 +04:00
|
|
|
|
2012-09-19 03:20:30 +04:00
|
|
|
tmprc = CIFSSMBUnixQPathInfo(xid, tcon, to_name,
|
|
|
|
info_buf_target,
|
|
|
|
cifs_sb->local_nls,
|
2014-09-27 11:19:01 +04:00
|
|
|
cifs_remap(cifs_sb));
|
2008-10-20 22:45:22 +04:00
|
|
|
|
2008-10-22 21:57:01 +04:00
|
|
|
if (tmprc == 0 && (info_buf_source->UniqueId ==
|
2008-11-03 22:05:08 +03:00
|
|
|
info_buf_target->UniqueId)) {
|
2008-10-20 22:45:22 +04:00
|
|
|
/* same file, POSIX says that this is a noop */
|
2008-11-03 22:05:08 +03:00
|
|
|
rc = 0;
|
2008-10-20 22:45:22 +04:00
|
|
|
goto cifs_rename_exit;
|
2008-11-03 22:05:08 +03:00
|
|
|
}
|
2012-09-19 03:20:30 +04:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* else ... BB we could add the same check for Windows by
|
|
|
|
* checking the UniqueId via FILE_INTERNAL_INFO
|
|
|
|
*/
|
2008-10-20 22:45:22 +04:00
|
|
|
|
2008-09-23 22:23:33 +04:00
|
|
|
unlink_target:
|
2009-04-17 19:45:30 +04:00
|
|
|
/* Try unlinking the target dentry if it's not negative */
|
2015-03-18 01:25:59 +03:00
|
|
|
if (d_really_is_positive(target_dentry) && (rc == -EACCES || rc == -EEXIST)) {
|
2014-08-22 13:32:09 +04:00
|
|
|
if (d_is_dir(target_dentry))
|
|
|
|
tmprc = cifs_rmdir(target_dir, target_dentry);
|
|
|
|
else
|
|
|
|
tmprc = cifs_unlink(target_dir, target_dentry);
|
2008-10-20 22:45:22 +04:00
|
|
|
if (tmprc)
|
|
|
|
goto cifs_rename_exit;
|
2012-09-19 03:20:30 +04:00
|
|
|
rc = cifs_do_rename(xid, source_dentry, from_name,
|
|
|
|
target_dentry, to_name);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2014-08-18 20:49:58 +04:00
|
|
|
/* force revalidate to go get info when needed */
|
|
|
|
CIFS_I(source_dir)->time = CIFS_I(target_dir)->time = 0;
|
|
|
|
|
|
|
|
source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime =
|
2017-05-09 01:59:16 +03:00
|
|
|
target_dir->i_mtime = current_time(source_dir);
|
2014-08-18 20:49:58 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
cifs_rename_exit:
|
2008-09-23 22:23:33 +04:00
|
|
|
kfree(info_buf_source);
|
2012-09-19 03:20:30 +04:00
|
|
|
kfree(from_name);
|
|
|
|
kfree(to_name);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
static bool
|
|
|
|
cifs_inode_needs_reval(struct inode *inode)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2010-02-12 15:44:16 +03:00
|
|
|
struct cifsInodeInfo *cifs_i = CIFS_I(inode);
|
2010-12-01 12:12:28 +03:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2018-05-23 23:54:27 +03:00
|
|
|
if (cifs_i->time == 0)
|
|
|
|
return true;
|
|
|
|
|
2013-09-05 13:01:06 +04:00
|
|
|
if (CIFS_CACHE_READ(cifs_i))
|
2010-02-12 15:44:16 +03:00
|
|
|
return false;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
if (!lookupCacheEnabled)
|
|
|
|
return true;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-03-26 18:24:23 +04:00
|
|
|
if (!cifs_sb->actimeo)
|
|
|
|
return true;
|
|
|
|
|
2010-12-01 12:12:28 +03:00
|
|
|
if (!time_in_range(jiffies, cifs_i->time,
|
|
|
|
cifs_i->time + cifs_sb->actimeo))
|
2010-02-12 15:44:16 +03:00
|
|
|
return true;
|
|
|
|
|
2010-05-17 22:51:49 +04:00
|
|
|
/* hardlinked files w/ noserverino get "special" treatment */
|
2010-12-01 12:12:28 +03:00
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) &&
|
2010-05-17 22:51:49 +04:00
|
|
|
S_ISREG(inode->i_mode) && inode->i_nlink != 1)
|
|
|
|
return true;
|
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-11-29 20:09:47 +03:00
|
|
|
/*
|
|
|
|
* Zap the cache. Called when invalid_mapping flag is set.
|
|
|
|
*/
|
2011-04-07 18:18:11 +04:00
|
|
|
int
|
2010-02-12 15:44:16 +03:00
|
|
|
cifs_invalidate_mapping(struct inode *inode)
|
|
|
|
{
|
2011-04-07 18:18:11 +04:00
|
|
|
int rc = 0;
|
2010-02-12 15:44:16 +03:00
|
|
|
|
|
|
|
if (inode->i_mapping && inode->i_mapping->nrpages != 0) {
|
2011-03-16 01:55:32 +03:00
|
|
|
rc = invalidate_inode_pages2(inode->i_mapping);
|
2014-04-30 17:31:47 +04:00
|
|
|
if (rc)
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(VFS, "%s: could not invalidate inode %p\n",
|
|
|
|
__func__, inode);
|
2010-02-12 15:44:16 +03:00
|
|
|
}
|
2011-03-16 01:55:32 +03:00
|
|
|
|
2010-07-05 16:42:45 +04:00
|
|
|
cifs_fscache_reset_inode_cookie(inode);
|
2011-04-07 18:18:11 +04:00
|
|
|
return rc;
|
2010-02-12 15:44:16 +03:00
|
|
|
}
|
|
|
|
|
2014-04-30 17:31:47 +04:00
|
|
|
/**
|
|
|
|
* cifs_wait_bit_killable - helper for functions that are sleeping on bit locks
|
|
|
|
* @word: long word containing the bit lock
|
|
|
|
*/
|
|
|
|
static int
|
2015-12-14 00:11:16 +03:00
|
|
|
cifs_wait_bit_killable(struct wait_bit_key *key, int mode)
|
2014-04-30 17:31:47 +04:00
|
|
|
{
|
|
|
|
freezable_schedule_unsafe();
|
2015-12-14 00:11:16 +03:00
|
|
|
if (signal_pending_state(mode, current))
|
|
|
|
return -ERESTARTSYS;
|
2014-04-30 17:31:47 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-04-30 17:31:46 +04:00
|
|
|
int
|
|
|
|
cifs_revalidate_mapping(struct inode *inode)
|
|
|
|
{
|
2014-04-30 17:31:47 +04:00
|
|
|
int rc;
|
|
|
|
unsigned long *flags = &CIFS_I(inode)->flags;
|
|
|
|
|
sched: Remove proliferation of wait_on_bit() action functions
The current "wait_on_bit" interface requires an 'action'
function to be provided which does the actual waiting.
There are over 20 such functions, many of them identical.
Most cases can be satisfied by one of just two functions, one
which uses io_schedule() and one which just uses schedule().
So:
Rename wait_on_bit and wait_on_bit_lock to
wait_on_bit_action and wait_on_bit_lock_action
to make it explicit that they need an action function.
Introduce new wait_on_bit{,_lock} and wait_on_bit{,_lock}_io
which are *not* given an action function but implicitly use
a standard one.
The decision to error-out if a signal is pending is now made
based on the 'mode' argument rather than being encoded in the action
function.
All instances of the old wait_on_bit and wait_on_bit_lock which
can use the new version have been changed accordingly and their
action functions have been discarded.
wait_on_bit{_lock} does not return any specific error code in the
event of a signal so the caller must check for non-zero and
interpolate their own error code as appropriate.
The wait_on_bit() call in __fscache_wait_on_invalidate() was
ambiguous as it specified TASK_UNINTERRUPTIBLE but used
fscache_wait_bit_interruptible as an action function.
David Howells confirms this should be uniformly
"uninterruptible"
The main remaining user of wait_on_bit{,_lock}_action is NFS
which needs to use a freezer-aware schedule() call.
A comment in fs/gfs2/glock.c notes that having multiple 'action'
functions is useful as they display differently in the 'wchan'
field of 'ps'. (and /proc/$PID/wchan).
As the new bit_wait{,_io} functions are tagged "__sched", they
will not show up at all, but something higher in the stack. So
the distinction will still be visible, only with different
function names (gds2_glock_wait versus gfs2_glock_dq_wait in the
gfs2/glock.c case).
Since first version of this patch (against 3.15) two new action
functions appeared, on in NFS and one in CIFS. CIFS also now
uses an action function that makes the same freezer aware
schedule call as NFS.
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: David Howells <dhowells@redhat.com> (fscache, keys)
Acked-by: Steven Whitehouse <swhiteho@redhat.com> (gfs2)
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steve French <sfrench@samba.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20140707051603.28027.72349.stgit@notabene.brown
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-07-07 09:16:04 +04:00
|
|
|
rc = wait_on_bit_lock_action(flags, CIFS_INO_LOCK, cifs_wait_bit_killable,
|
|
|
|
TASK_KILLABLE);
|
2014-04-30 17:31:47 +04:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
if (test_and_clear_bit(CIFS_INO_INVALID_MAPPING, flags)) {
|
|
|
|
rc = cifs_invalidate_mapping(inode);
|
|
|
|
if (rc)
|
|
|
|
set_bit(CIFS_INO_INVALID_MAPPING, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
clear_bit_unlock(CIFS_INO_LOCK, flags);
|
2014-06-10 06:08:43 +04:00
|
|
|
smp_mb__after_atomic();
|
2014-04-30 17:31:47 +04:00
|
|
|
wake_up_bit(flags, CIFS_INO_LOCK);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
cifs_zap_mapping(struct inode *inode)
|
|
|
|
{
|
|
|
|
set_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(inode)->flags);
|
|
|
|
return cifs_revalidate_mapping(inode);
|
2014-04-30 17:31:46 +04:00
|
|
|
}
|
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
int cifs_revalidate_file_attr(struct file *filp)
|
2010-02-12 15:44:18 +03:00
|
|
|
{
|
|
|
|
int rc = 0;
|
2013-01-24 02:07:38 +04:00
|
|
|
struct inode *inode = file_inode(filp);
|
2010-09-21 03:01:31 +04:00
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;
|
2010-02-12 15:44:18 +03:00
|
|
|
|
|
|
|
if (!cifs_inode_needs_reval(inode))
|
2011-04-07 18:18:11 +04:00
|
|
|
return rc;
|
2010-02-12 15:44:18 +03:00
|
|
|
|
2010-09-30 03:51:11 +04:00
|
|
|
if (tlink_tcon(cfile->tlink)->unix_ext)
|
2010-02-12 15:44:18 +03:00
|
|
|
rc = cifs_get_file_info_unix(filp);
|
|
|
|
else
|
|
|
|
rc = cifs_get_file_info(filp);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
int cifs_revalidate_dentry_attr(struct dentry *dentry)
|
2010-02-12 15:44:16 +03:00
|
|
|
{
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2010-02-12 15:44:16 +03:00
|
|
|
int rc = 0;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2010-02-12 15:44:16 +03:00
|
|
|
struct super_block *sb = dentry->d_sb;
|
2011-04-07 18:18:11 +04:00
|
|
|
char *full_path = NULL;
|
2010-02-12 15:44:16 +03:00
|
|
|
|
|
|
|
if (inode == NULL)
|
|
|
|
return -ENOENT;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-12 15:44:16 +03:00
|
|
|
if (!cifs_inode_needs_reval(inode))
|
2011-04-07 18:18:11 +04:00
|
|
|
return rc;
|
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* can not safely grab the rename sem here if rename calls revalidate
|
|
|
|
since that would deadlock */
|
2010-02-12 15:44:16 +03:00
|
|
|
full_path = build_path_from_dentry(dentry);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 16:42:34 +04:00
|
|
|
rc = -ENOMEM;
|
2011-04-07 18:18:11 +04:00
|
|
|
goto out;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "Update attributes: %s inode 0x%p count %d dentry: 0x%p d_time %ld jiffies %ld\n",
|
|
|
|
full_path, inode, inode->i_count.counter,
|
2016-09-16 13:44:21 +03:00
|
|
|
dentry, cifs_get_time(dentry), jiffies);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-09-21 03:01:35 +04:00
|
|
|
if (cifs_sb_master_tcon(CIFS_SB(sb))->unix_ext)
|
2010-02-12 15:44:16 +03:00
|
|
|
rc = cifs_get_inode_info_unix(&inode, full_path, sb, xid);
|
|
|
|
else
|
|
|
|
rc = cifs_get_inode_info(&inode, full_path, NULL, sb,
|
|
|
|
xid, NULL);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
out:
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(full_path);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
int cifs_revalidate_file(struct file *filp)
|
|
|
|
{
|
|
|
|
int rc;
|
2013-01-24 02:07:38 +04:00
|
|
|
struct inode *inode = file_inode(filp);
|
2011-04-07 18:18:11 +04:00
|
|
|
|
|
|
|
rc = cifs_revalidate_file_attr(filp);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2014-04-30 17:31:46 +04:00
|
|
|
return cifs_revalidate_mapping(inode);
|
2011-04-07 18:18:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* revalidate a dentry's inode attributes */
|
|
|
|
int cifs_revalidate_dentry(struct dentry *dentry)
|
|
|
|
{
|
|
|
|
int rc;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2011-04-07 18:18:11 +04:00
|
|
|
|
|
|
|
rc = cifs_revalidate_dentry_attr(dentry);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2014-04-30 17:31:46 +04:00
|
|
|
return cifs_revalidate_mapping(inode);
|
2011-04-07 18:18:11 +04:00
|
|
|
}
|
|
|
|
|
statx: Add a system call to make enhanced file info available
Add a system call to make extended file information available, including
file creation and some attribute flags where available through the
underlying filesystem.
The getattr inode operation is altered to take two additional arguments: a
u32 request_mask and an unsigned int flags that indicate the
synchronisation mode. This change is propagated to the vfs_getattr*()
function.
Functions like vfs_stat() are now inline wrappers around new functions
vfs_statx() and vfs_statx_fd() to reduce stack usage.
========
OVERVIEW
========
The idea was initially proposed as a set of xattrs that could be retrieved
with getxattr(), but the general preference proved to be for a new syscall
with an extended stat structure.
A number of requests were gathered for features to be included. The
following have been included:
(1) Make the fields a consistent size on all arches and make them large.
(2) Spare space, request flags and information flags are provided for
future expansion.
(3) Better support for the y2038 problem [Arnd Bergmann] (tv_sec is an
__s64).
(4) Creation time: The SMB protocol carries the creation time, which could
be exported by Samba, which will in turn help CIFS make use of
FS-Cache as that can be used for coherency data (stx_btime).
This is also specified in NFSv4 as a recommended attribute and could
be exported by NFSD [Steve French].
(5) Lightweight stat: Ask for just those details of interest, and allow a
netfs (such as NFS) to approximate anything not of interest, possibly
without going to the server [Trond Myklebust, Ulrich Drepper, Andreas
Dilger] (AT_STATX_DONT_SYNC).
(6) Heavyweight stat: Force a netfs to go to the server, even if it thinks
its cached attributes are up to date [Trond Myklebust]
(AT_STATX_FORCE_SYNC).
And the following have been left out for future extension:
(7) Data version number: Could be used by userspace NFS servers [Aneesh
Kumar].
Can also be used to modify fill_post_wcc() in NFSD which retrieves
i_version directly, but has just called vfs_getattr(). It could get
it from the kstat struct if it used vfs_xgetattr() instead.
(There's disagreement on the exact semantics of a single field, since
not all filesystems do this the same way).
(8) BSD stat compatibility: Including more fields from the BSD stat such
as creation time (st_btime) and inode generation number (st_gen)
[Jeremy Allison, Bernd Schubert].
(9) Inode generation number: Useful for FUSE and userspace NFS servers
[Bernd Schubert].
(This was asked for but later deemed unnecessary with the
open-by-handle capability available and caused disagreement as to
whether it's a security hole or not).
(10) Extra coherency data may be useful in making backups [Andreas Dilger].
(No particular data were offered, but things like last backup
timestamp, the data version number and the DOS archive bit would come
into this category).
(11) Allow the filesystem to indicate what it can/cannot provide: A
filesystem can now say it doesn't support a standard stat feature if
that isn't available, so if, for instance, inode numbers or UIDs don't
exist or are fabricated locally...
(This requires a separate system call - I have an fsinfo() call idea
for this).
(12) Store a 16-byte volume ID in the superblock that can be returned in
struct xstat [Steve French].
(Deferred to fsinfo).
(13) Include granularity fields in the time data to indicate the
granularity of each of the times (NFSv4 time_delta) [Steve French].
(Deferred to fsinfo).
(14) FS_IOC_GETFLAGS value. These could be translated to BSD's st_flags.
Note that the Linux IOC flags are a mess and filesystems such as Ext4
define flags that aren't in linux/fs.h, so translation in the kernel
may be a necessity (or, possibly, we provide the filesystem type too).
(Some attributes are made available in stx_attributes, but the general
feeling was that the IOC flags were to ext[234]-specific and shouldn't
be exposed through statx this way).
(15) Mask of features available on file (eg: ACLs, seclabel) [Brad Boyer,
Michael Kerrisk].
(Deferred, probably to fsinfo. Finding out if there's an ACL or
seclabal might require extra filesystem operations).
(16) Femtosecond-resolution timestamps [Dave Chinner].
(A __reserved field has been left in the statx_timestamp struct for
this - if there proves to be a need).
(17) A set multiple attributes syscall to go with this.
===============
NEW SYSTEM CALL
===============
The new system call is:
int ret = statx(int dfd,
const char *filename,
unsigned int flags,
unsigned int mask,
struct statx *buffer);
The dfd, filename and flags parameters indicate the file to query, in a
similar way to fstatat(). There is no equivalent of lstat() as that can be
emulated with statx() by passing AT_SYMLINK_NOFOLLOW in flags. There is
also no equivalent of fstat() as that can be emulated by passing a NULL
filename to statx() with the fd of interest in dfd.
Whether or not statx() synchronises the attributes with the backing store
can be controlled by OR'ing a value into the flags argument (this typically
only affects network filesystems):
(1) AT_STATX_SYNC_AS_STAT tells statx() to behave as stat() does in this
respect.
(2) AT_STATX_FORCE_SYNC will require a network filesystem to synchronise
its attributes with the server - which might require data writeback to
occur to get the timestamps correct.
(3) AT_STATX_DONT_SYNC will suppress synchronisation with the server in a
network filesystem. The resulting values should be considered
approximate.
mask is a bitmask indicating the fields in struct statx that are of
interest to the caller. The user should set this to STATX_BASIC_STATS to
get the basic set returned by stat(). It should be noted that asking for
more information may entail extra I/O operations.
buffer points to the destination for the data. This must be 256 bytes in
size.
======================
MAIN ATTRIBUTES RECORD
======================
The following structures are defined in which to return the main attribute
set:
struct statx_timestamp {
__s64 tv_sec;
__s32 tv_nsec;
__s32 __reserved;
};
struct statx {
__u32 stx_mask;
__u32 stx_blksize;
__u64 stx_attributes;
__u32 stx_nlink;
__u32 stx_uid;
__u32 stx_gid;
__u16 stx_mode;
__u16 __spare0[1];
__u64 stx_ino;
__u64 stx_size;
__u64 stx_blocks;
__u64 __spare1[1];
struct statx_timestamp stx_atime;
struct statx_timestamp stx_btime;
struct statx_timestamp stx_ctime;
struct statx_timestamp stx_mtime;
__u32 stx_rdev_major;
__u32 stx_rdev_minor;
__u32 stx_dev_major;
__u32 stx_dev_minor;
__u64 __spare2[14];
};
The defined bits in request_mask and stx_mask are:
STATX_TYPE Want/got stx_mode & S_IFMT
STATX_MODE Want/got stx_mode & ~S_IFMT
STATX_NLINK Want/got stx_nlink
STATX_UID Want/got stx_uid
STATX_GID Want/got stx_gid
STATX_ATIME Want/got stx_atime{,_ns}
STATX_MTIME Want/got stx_mtime{,_ns}
STATX_CTIME Want/got stx_ctime{,_ns}
STATX_INO Want/got stx_ino
STATX_SIZE Want/got stx_size
STATX_BLOCKS Want/got stx_blocks
STATX_BASIC_STATS [The stuff in the normal stat struct]
STATX_BTIME Want/got stx_btime{,_ns}
STATX_ALL [All currently available stuff]
stx_btime is the file creation time, stx_mask is a bitmask indicating the
data provided and __spares*[] are where as-yet undefined fields can be
placed.
Time fields are structures with separate seconds and nanoseconds fields
plus a reserved field in case we want to add even finer resolution. Note
that times will be negative if before 1970; in such a case, the nanosecond
fields will also be negative if not zero.
The bits defined in the stx_attributes field convey information about a
file, how it is accessed, where it is and what it does. The following
attributes map to FS_*_FL flags and are the same numerical value:
STATX_ATTR_COMPRESSED File is compressed by the fs
STATX_ATTR_IMMUTABLE File is marked immutable
STATX_ATTR_APPEND File is append-only
STATX_ATTR_NODUMP File is not to be dumped
STATX_ATTR_ENCRYPTED File requires key to decrypt in fs
Within the kernel, the supported flags are listed by:
KSTAT_ATTR_FS_IOC_FLAGS
[Are any other IOC flags of sufficient general interest to be exposed
through this interface?]
New flags include:
STATX_ATTR_AUTOMOUNT Object is an automount trigger
These are for the use of GUI tools that might want to mark files specially,
depending on what they are.
Fields in struct statx come in a number of classes:
(0) stx_dev_*, stx_blksize.
These are local system information and are always available.
(1) stx_mode, stx_nlinks, stx_uid, stx_gid, stx_[amc]time, stx_ino,
stx_size, stx_blocks.
These will be returned whether the caller asks for them or not. The
corresponding bits in stx_mask will be set to indicate whether they
actually have valid values.
If the caller didn't ask for them, then they may be approximated. For
example, NFS won't waste any time updating them from the server,
unless as a byproduct of updating something requested.
If the values don't actually exist for the underlying object (such as
UID or GID on a DOS file), then the bit won't be set in the stx_mask,
even if the caller asked for the value. In such a case, the returned
value will be a fabrication.
Note that there are instances where the type might not be valid, for
instance Windows reparse points.
(2) stx_rdev_*.
This will be set only if stx_mode indicates we're looking at a
blockdev or a chardev, otherwise will be 0.
(3) stx_btime.
Similar to (1), except this will be set to 0 if it doesn't exist.
=======
TESTING
=======
The following test program can be used to test the statx system call:
samples/statx/test-statx.c
Just compile and run, passing it paths to the files you want to examine.
The file is built automatically if CONFIG_SAMPLES is enabled.
Here's some example output. Firstly, an NFS directory that crosses to
another FSID. Note that the AUTOMOUNT attribute is set because transiting
this directory will cause d_automount to be invoked by the VFS.
[root@andromeda ~]# /tmp/test-statx -A /warthog/data
statx(/warthog/data) = 0
results=7ff
Size: 4096 Blocks: 8 IO Block: 1048576 directory
Device: 00:26 Inode: 1703937 Links: 125
Access: (3777/drwxrwxrwx) Uid: 0 Gid: 4041
Access: 2016-11-24 09:02:12.219699527+0000
Modify: 2016-11-17 10:44:36.225653653+0000
Change: 2016-11-17 10:44:36.225653653+0000
Attributes: 0000000000001000 (-------- -------- -------- -------- -------- -------- ---m---- --------)
Secondly, the result of automounting on that directory.
[root@andromeda ~]# /tmp/test-statx /warthog/data
statx(/warthog/data) = 0
results=7ff
Size: 4096 Blocks: 8 IO Block: 1048576 directory
Device: 00:27 Inode: 2 Links: 125
Access: (3777/drwxrwxrwx) Uid: 0 Gid: 4041
Access: 2016-11-24 09:02:12.219699527+0000
Modify: 2016-11-17 10:44:36.225653653+0000
Change: 2016-11-17 10:44:36.225653653+0000
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2017-01-31 19:46:22 +03:00
|
|
|
int cifs_getattr(const struct path *path, struct kstat *stat,
|
|
|
|
u32 request_mask, unsigned int flags)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
statx: Add a system call to make enhanced file info available
Add a system call to make extended file information available, including
file creation and some attribute flags where available through the
underlying filesystem.
The getattr inode operation is altered to take two additional arguments: a
u32 request_mask and an unsigned int flags that indicate the
synchronisation mode. This change is propagated to the vfs_getattr*()
function.
Functions like vfs_stat() are now inline wrappers around new functions
vfs_statx() and vfs_statx_fd() to reduce stack usage.
========
OVERVIEW
========
The idea was initially proposed as a set of xattrs that could be retrieved
with getxattr(), but the general preference proved to be for a new syscall
with an extended stat structure.
A number of requests were gathered for features to be included. The
following have been included:
(1) Make the fields a consistent size on all arches and make them large.
(2) Spare space, request flags and information flags are provided for
future expansion.
(3) Better support for the y2038 problem [Arnd Bergmann] (tv_sec is an
__s64).
(4) Creation time: The SMB protocol carries the creation time, which could
be exported by Samba, which will in turn help CIFS make use of
FS-Cache as that can be used for coherency data (stx_btime).
This is also specified in NFSv4 as a recommended attribute and could
be exported by NFSD [Steve French].
(5) Lightweight stat: Ask for just those details of interest, and allow a
netfs (such as NFS) to approximate anything not of interest, possibly
without going to the server [Trond Myklebust, Ulrich Drepper, Andreas
Dilger] (AT_STATX_DONT_SYNC).
(6) Heavyweight stat: Force a netfs to go to the server, even if it thinks
its cached attributes are up to date [Trond Myklebust]
(AT_STATX_FORCE_SYNC).
And the following have been left out for future extension:
(7) Data version number: Could be used by userspace NFS servers [Aneesh
Kumar].
Can also be used to modify fill_post_wcc() in NFSD which retrieves
i_version directly, but has just called vfs_getattr(). It could get
it from the kstat struct if it used vfs_xgetattr() instead.
(There's disagreement on the exact semantics of a single field, since
not all filesystems do this the same way).
(8) BSD stat compatibility: Including more fields from the BSD stat such
as creation time (st_btime) and inode generation number (st_gen)
[Jeremy Allison, Bernd Schubert].
(9) Inode generation number: Useful for FUSE and userspace NFS servers
[Bernd Schubert].
(This was asked for but later deemed unnecessary with the
open-by-handle capability available and caused disagreement as to
whether it's a security hole or not).
(10) Extra coherency data may be useful in making backups [Andreas Dilger].
(No particular data were offered, but things like last backup
timestamp, the data version number and the DOS archive bit would come
into this category).
(11) Allow the filesystem to indicate what it can/cannot provide: A
filesystem can now say it doesn't support a standard stat feature if
that isn't available, so if, for instance, inode numbers or UIDs don't
exist or are fabricated locally...
(This requires a separate system call - I have an fsinfo() call idea
for this).
(12) Store a 16-byte volume ID in the superblock that can be returned in
struct xstat [Steve French].
(Deferred to fsinfo).
(13) Include granularity fields in the time data to indicate the
granularity of each of the times (NFSv4 time_delta) [Steve French].
(Deferred to fsinfo).
(14) FS_IOC_GETFLAGS value. These could be translated to BSD's st_flags.
Note that the Linux IOC flags are a mess and filesystems such as Ext4
define flags that aren't in linux/fs.h, so translation in the kernel
may be a necessity (or, possibly, we provide the filesystem type too).
(Some attributes are made available in stx_attributes, but the general
feeling was that the IOC flags were to ext[234]-specific and shouldn't
be exposed through statx this way).
(15) Mask of features available on file (eg: ACLs, seclabel) [Brad Boyer,
Michael Kerrisk].
(Deferred, probably to fsinfo. Finding out if there's an ACL or
seclabal might require extra filesystem operations).
(16) Femtosecond-resolution timestamps [Dave Chinner].
(A __reserved field has been left in the statx_timestamp struct for
this - if there proves to be a need).
(17) A set multiple attributes syscall to go with this.
===============
NEW SYSTEM CALL
===============
The new system call is:
int ret = statx(int dfd,
const char *filename,
unsigned int flags,
unsigned int mask,
struct statx *buffer);
The dfd, filename and flags parameters indicate the file to query, in a
similar way to fstatat(). There is no equivalent of lstat() as that can be
emulated with statx() by passing AT_SYMLINK_NOFOLLOW in flags. There is
also no equivalent of fstat() as that can be emulated by passing a NULL
filename to statx() with the fd of interest in dfd.
Whether or not statx() synchronises the attributes with the backing store
can be controlled by OR'ing a value into the flags argument (this typically
only affects network filesystems):
(1) AT_STATX_SYNC_AS_STAT tells statx() to behave as stat() does in this
respect.
(2) AT_STATX_FORCE_SYNC will require a network filesystem to synchronise
its attributes with the server - which might require data writeback to
occur to get the timestamps correct.
(3) AT_STATX_DONT_SYNC will suppress synchronisation with the server in a
network filesystem. The resulting values should be considered
approximate.
mask is a bitmask indicating the fields in struct statx that are of
interest to the caller. The user should set this to STATX_BASIC_STATS to
get the basic set returned by stat(). It should be noted that asking for
more information may entail extra I/O operations.
buffer points to the destination for the data. This must be 256 bytes in
size.
======================
MAIN ATTRIBUTES RECORD
======================
The following structures are defined in which to return the main attribute
set:
struct statx_timestamp {
__s64 tv_sec;
__s32 tv_nsec;
__s32 __reserved;
};
struct statx {
__u32 stx_mask;
__u32 stx_blksize;
__u64 stx_attributes;
__u32 stx_nlink;
__u32 stx_uid;
__u32 stx_gid;
__u16 stx_mode;
__u16 __spare0[1];
__u64 stx_ino;
__u64 stx_size;
__u64 stx_blocks;
__u64 __spare1[1];
struct statx_timestamp stx_atime;
struct statx_timestamp stx_btime;
struct statx_timestamp stx_ctime;
struct statx_timestamp stx_mtime;
__u32 stx_rdev_major;
__u32 stx_rdev_minor;
__u32 stx_dev_major;
__u32 stx_dev_minor;
__u64 __spare2[14];
};
The defined bits in request_mask and stx_mask are:
STATX_TYPE Want/got stx_mode & S_IFMT
STATX_MODE Want/got stx_mode & ~S_IFMT
STATX_NLINK Want/got stx_nlink
STATX_UID Want/got stx_uid
STATX_GID Want/got stx_gid
STATX_ATIME Want/got stx_atime{,_ns}
STATX_MTIME Want/got stx_mtime{,_ns}
STATX_CTIME Want/got stx_ctime{,_ns}
STATX_INO Want/got stx_ino
STATX_SIZE Want/got stx_size
STATX_BLOCKS Want/got stx_blocks
STATX_BASIC_STATS [The stuff in the normal stat struct]
STATX_BTIME Want/got stx_btime{,_ns}
STATX_ALL [All currently available stuff]
stx_btime is the file creation time, stx_mask is a bitmask indicating the
data provided and __spares*[] are where as-yet undefined fields can be
placed.
Time fields are structures with separate seconds and nanoseconds fields
plus a reserved field in case we want to add even finer resolution. Note
that times will be negative if before 1970; in such a case, the nanosecond
fields will also be negative if not zero.
The bits defined in the stx_attributes field convey information about a
file, how it is accessed, where it is and what it does. The following
attributes map to FS_*_FL flags and are the same numerical value:
STATX_ATTR_COMPRESSED File is compressed by the fs
STATX_ATTR_IMMUTABLE File is marked immutable
STATX_ATTR_APPEND File is append-only
STATX_ATTR_NODUMP File is not to be dumped
STATX_ATTR_ENCRYPTED File requires key to decrypt in fs
Within the kernel, the supported flags are listed by:
KSTAT_ATTR_FS_IOC_FLAGS
[Are any other IOC flags of sufficient general interest to be exposed
through this interface?]
New flags include:
STATX_ATTR_AUTOMOUNT Object is an automount trigger
These are for the use of GUI tools that might want to mark files specially,
depending on what they are.
Fields in struct statx come in a number of classes:
(0) stx_dev_*, stx_blksize.
These are local system information and are always available.
(1) stx_mode, stx_nlinks, stx_uid, stx_gid, stx_[amc]time, stx_ino,
stx_size, stx_blocks.
These will be returned whether the caller asks for them or not. The
corresponding bits in stx_mask will be set to indicate whether they
actually have valid values.
If the caller didn't ask for them, then they may be approximated. For
example, NFS won't waste any time updating them from the server,
unless as a byproduct of updating something requested.
If the values don't actually exist for the underlying object (such as
UID or GID on a DOS file), then the bit won't be set in the stx_mask,
even if the caller asked for the value. In such a case, the returned
value will be a fabrication.
Note that there are instances where the type might not be valid, for
instance Windows reparse points.
(2) stx_rdev_*.
This will be set only if stx_mode indicates we're looking at a
blockdev or a chardev, otherwise will be 0.
(3) stx_btime.
Similar to (1), except this will be set to 0 if it doesn't exist.
=======
TESTING
=======
The following test program can be used to test the statx system call:
samples/statx/test-statx.c
Just compile and run, passing it paths to the files you want to examine.
The file is built automatically if CONFIG_SAMPLES is enabled.
Here's some example output. Firstly, an NFS directory that crosses to
another FSID. Note that the AUTOMOUNT attribute is set because transiting
this directory will cause d_automount to be invoked by the VFS.
[root@andromeda ~]# /tmp/test-statx -A /warthog/data
statx(/warthog/data) = 0
results=7ff
Size: 4096 Blocks: 8 IO Block: 1048576 directory
Device: 00:26 Inode: 1703937 Links: 125
Access: (3777/drwxrwxrwx) Uid: 0 Gid: 4041
Access: 2016-11-24 09:02:12.219699527+0000
Modify: 2016-11-17 10:44:36.225653653+0000
Change: 2016-11-17 10:44:36.225653653+0000
Attributes: 0000000000001000 (-------- -------- -------- -------- -------- -------- ---m---- --------)
Secondly, the result of automounting on that directory.
[root@andromeda ~]# /tmp/test-statx /warthog/data
statx(/warthog/data) = 0
results=7ff
Size: 4096 Blocks: 8 IO Block: 1048576 directory
Device: 00:27 Inode: 2 Links: 125
Access: (3777/drwxrwxrwx) Uid: 0 Gid: 4041
Access: 2016-11-24 09:02:12.219699527+0000
Modify: 2016-11-17 10:44:36.225653653+0000
Change: 2016-11-17 10:44:36.225653653+0000
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2017-01-31 19:46:22 +03:00
|
|
|
struct dentry *dentry = path->dentry;
|
2010-10-07 22:46:28 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(dentry->d_sb);
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2011-04-07 18:18:11 +04:00
|
|
|
int rc;
|
2010-10-07 22:46:28 +04:00
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
/*
|
|
|
|
* We need to be sure that all dirty pages are written and the server
|
|
|
|
* has actual ctime, mtime and file length.
|
|
|
|
*/
|
2013-09-05 13:01:06 +04:00
|
|
|
if (!CIFS_CACHE_READ(CIFS_I(inode)) && inode->i_mapping &&
|
2011-04-07 18:18:11 +04:00
|
|
|
inode->i_mapping->nrpages != 0) {
|
|
|
|
rc = filemap_fdatawait(inode->i_mapping);
|
2011-05-20 21:00:01 +04:00
|
|
|
if (rc) {
|
|
|
|
mapping_set_error(inode->i_mapping, rc);
|
|
|
|
return rc;
|
|
|
|
}
|
2011-04-07 18:18:11 +04:00
|
|
|
}
|
2010-10-12 19:32:42 +04:00
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
rc = cifs_revalidate_dentry_attr(dentry);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
generic_fillattr(inode, stat);
|
|
|
|
stat->blksize = CIFS_MAX_MSGSIZE;
|
|
|
|
stat->ino = CIFS_I(inode)->uniqueid;
|
|
|
|
|
2017-09-22 05:32:29 +03:00
|
|
|
/* old CIFS Unix Extensions doesn't return create time */
|
|
|
|
if (CIFS_I(inode)->createtime) {
|
|
|
|
stat->result_mask |= STATX_BTIME;
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
stat->btime = timespec_to_timespec64(
|
|
|
|
cifs_NTtimeToUnix(cpu_to_le64(CIFS_I(inode)->createtime)));
|
2017-09-22 05:32:29 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
stat->attributes_mask |= (STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED);
|
|
|
|
if (CIFS_I(inode)->cifsAttrs & FILE_ATTRIBUTE_COMPRESSED)
|
|
|
|
stat->attributes |= STATX_ATTR_COMPRESSED;
|
|
|
|
if (CIFS_I(inode)->cifsAttrs & FILE_ATTRIBUTE_ENCRYPTED)
|
|
|
|
stat->attributes |= STATX_ATTR_ENCRYPTED;
|
|
|
|
|
2011-04-07 18:18:11 +04:00
|
|
|
/*
|
2012-11-25 17:00:40 +04:00
|
|
|
* If on a multiuser mount without unix extensions or cifsacl being
|
|
|
|
* enabled, and the admin hasn't overridden them, set the ownership
|
|
|
|
* to the fsuid/fsgid of the current process.
|
2011-04-07 18:18:11 +04:00
|
|
|
*/
|
|
|
|
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER) &&
|
2012-11-25 17:00:40 +04:00
|
|
|
!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) &&
|
2011-04-07 18:18:11 +04:00
|
|
|
!tcon->unix_ext) {
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID))
|
|
|
|
stat->uid = current_fsuid();
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID))
|
|
|
|
stat->gid = current_fsgid();
|
2006-11-07 22:26:33 +03:00
|
|
|
}
|
2011-04-07 18:18:11 +04:00
|
|
|
return rc;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int cifs_truncate_page(struct address_space *mapping, loff_t from)
|
|
|
|
{
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
pgoff_t index = from >> PAGE_SHIFT;
|
|
|
|
unsigned offset = from & (PAGE_SIZE - 1);
|
2005-04-17 02:20:36 +04:00
|
|
|
struct page *page;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
page = grab_cache_page(mapping, index);
|
|
|
|
if (!page)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
zero_user_segment(page, offset, PAGE_SIZE);
|
2005-04-17 02:20:36 +04:00
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 15:29:47 +03:00
|
|
|
put_page(page);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-07-19 01:51:21 +04:00
|
|
|
static void cifs_setsize(struct inode *inode, loff_t offset)
|
2007-02-26 19:46:11 +03:00
|
|
|
{
|
2018-05-23 23:54:27 +03:00
|
|
|
struct cifsInodeInfo *cifs_i = CIFS_I(inode);
|
|
|
|
|
2007-02-26 23:06:29 +03:00
|
|
|
spin_lock(&inode->i_lock);
|
2007-02-26 19:46:11 +03:00
|
|
|
i_size_write(inode, offset);
|
2007-02-26 23:06:29 +03:00
|
|
|
spin_unlock(&inode->i_lock);
|
2010-07-19 01:51:21 +04:00
|
|
|
|
2018-05-23 23:54:27 +03:00
|
|
|
/* Cached inode must be refreshed on truncate */
|
|
|
|
cifs_i->time = 0;
|
2013-09-13 02:13:56 +04:00
|
|
|
truncate_pagecache(inode, offset);
|
2007-02-26 19:46:11 +03:00
|
|
|
}
|
|
|
|
|
2008-07-24 01:28:12 +04:00
|
|
|
static int
|
|
|
|
cifs_set_file_size(struct inode *inode, struct iattr *attrs,
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid, char *full_path)
|
2008-07-24 01:28:12 +04:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct cifsFileInfo *open_file;
|
|
|
|
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink = NULL;
|
2012-09-19 03:20:31 +04:00
|
|
|
struct cifs_tcon *tcon = NULL;
|
|
|
|
struct TCP_Server_Info *server;
|
2008-07-24 01:28:12 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid spurious oplock breaks from server, in the case of
|
|
|
|
* inodes that we already have open, avoid doing path based
|
|
|
|
* setting of file size if we can do it by handle.
|
|
|
|
* This keeps our caching token (oplock) and avoids timeouts
|
|
|
|
* when the local oplock break takes longer to flush
|
|
|
|
* writebehind data than the SMB timeout for the SetPathInfo
|
|
|
|
* request would allow
|
|
|
|
*/
|
2010-09-30 03:51:11 +04:00
|
|
|
open_file = find_writable_file(cifsInode, true);
|
2008-07-24 01:28:12 +04:00
|
|
|
if (open_file) {
|
2012-09-19 03:20:31 +04:00
|
|
|
tcon = tlink_tcon(open_file->tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
if (server->ops->set_file_size)
|
|
|
|
rc = server->ops->set_file_size(xid, tcon, open_file,
|
|
|
|
attrs->ia_size, false);
|
|
|
|
else
|
|
|
|
rc = -ENOSYS;
|
2009-08-31 19:07:12 +04:00
|
|
|
cifsFileInfo_put(open_file);
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "SetFSize for attrs rc = %d\n", rc);
|
2008-07-24 01:28:12 +04:00
|
|
|
} else
|
|
|
|
rc = -EINVAL;
|
|
|
|
|
2012-09-19 03:20:31 +04:00
|
|
|
if (!rc)
|
|
|
|
goto set_size_out;
|
|
|
|
|
|
|
|
if (tcon == NULL) {
|
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink))
|
|
|
|
return PTR_ERR(tlink);
|
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
}
|
2010-09-21 03:01:31 +04:00
|
|
|
|
2012-09-19 03:20:31 +04:00
|
|
|
/*
|
|
|
|
* Set file size by pathname rather than by handle either because no
|
|
|
|
* valid, writeable file handle for it was found or because there was
|
|
|
|
* an error setting it by handle.
|
|
|
|
*/
|
|
|
|
if (server->ops->set_path_size)
|
|
|
|
rc = server->ops->set_path_size(xid, tcon, full_path,
|
|
|
|
attrs->ia_size, cifs_sb, false);
|
|
|
|
else
|
|
|
|
rc = -ENOSYS;
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "SetEOF by path (setattrs) rc = %d\n", rc);
|
2012-09-19 03:20:31 +04:00
|
|
|
|
|
|
|
if (tlink)
|
|
|
|
cifs_put_tlink(tlink);
|
2008-07-24 01:28:12 +04:00
|
|
|
|
2012-09-19 03:20:31 +04:00
|
|
|
set_size_out:
|
2008-07-24 01:28:12 +04:00
|
|
|
if (rc == 0) {
|
2009-04-03 21:44:00 +04:00
|
|
|
cifsInode->server_eof = attrs->ia_size;
|
2010-07-19 01:51:21 +04:00
|
|
|
cifs_setsize(inode, attrs->ia_size);
|
2008-07-24 01:28:12 +04:00
|
|
|
cifs_truncate_page(inode->i_mapping, inode->i_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-08-02 15:26:12 +04:00
|
|
|
static int
|
|
|
|
cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
|
|
|
|
{
|
|
|
|
int rc;
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2008-08-02 15:26:12 +04:00
|
|
|
char *full_path = NULL;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(direntry);
|
2008-08-02 15:26:12 +04:00
|
|
|
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2010-09-30 03:51:11 +04:00
|
|
|
struct tcon_link *tlink;
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *pTcon;
|
2008-08-02 15:26:12 +04:00
|
|
|
struct cifs_unix_set_info_args *args = NULL;
|
2009-07-10 04:02:50 +04:00
|
|
|
struct cifsFileInfo *open_file;
|
2008-08-02 15:26:12 +04:00
|
|
|
|
2014-08-20 04:25:34 +04:00
|
|
|
cifs_dbg(FYI, "setattr_unix on file %pd attrs->ia_valid=0x%x\n",
|
|
|
|
direntry, attrs->ia_valid);
|
2008-08-02 15:26:12 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2008-08-02 15:26:12 +04:00
|
|
|
|
2010-06-04 13:30:03 +04:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
|
|
|
|
attrs->ia_valid |= ATTR_FORCE;
|
|
|
|
|
2016-05-26 17:55:18 +03:00
|
|
|
rc = setattr_prepare(direntry, attrs);
|
2010-06-04 13:30:03 +04:00
|
|
|
if (rc < 0)
|
|
|
|
goto out;
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
full_path = build_path_from_dentry(direntry);
|
|
|
|
if (full_path == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-03-26 20:35:37 +03:00
|
|
|
/*
|
|
|
|
* Attempt to flush data before changing attributes. We need to do
|
|
|
|
* this for ATTR_SIZE and ATTR_MTIME for sure, and if we change the
|
|
|
|
* ownership or mode then we may also need to do this. Here, we take
|
|
|
|
* the safe way out and just do the flush on all setattr requests. If
|
|
|
|
* the flush returns error, store it to report later and continue.
|
|
|
|
*
|
|
|
|
* BB: This should be smarter. Why bother flushing pages that
|
|
|
|
* will be truncated anyway? Also, should we error out here if
|
|
|
|
* the flush returns error?
|
|
|
|
*/
|
|
|
|
rc = filemap_write_and_wait(inode->i_mapping);
|
2010-10-22 22:52:29 +04:00
|
|
|
mapping_set_error(inode->i_mapping, rc);
|
|
|
|
rc = 0;
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_SIZE) {
|
|
|
|
rc = cifs_set_file_size(inode, attrs, xid, full_path);
|
|
|
|
if (rc != 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* skip mode change if it's just for clearing setuid/setgid */
|
|
|
|
if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
|
|
|
|
attrs->ia_valid &= ~ATTR_MODE;
|
|
|
|
|
|
|
|
args = kmalloc(sizeof(*args), GFP_KERNEL);
|
|
|
|
if (args == NULL) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* set up the struct */
|
|
|
|
if (attrs->ia_valid & ATTR_MODE)
|
|
|
|
args->mode = attrs->ia_mode;
|
|
|
|
else
|
|
|
|
args->mode = NO_CHANGE_64;
|
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_UID)
|
|
|
|
args->uid = attrs->ia_uid;
|
|
|
|
else
|
2013-02-06 12:57:56 +04:00
|
|
|
args->uid = INVALID_UID; /* no change */
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_GID)
|
|
|
|
args->gid = attrs->ia_gid;
|
|
|
|
else
|
2013-02-06 12:57:56 +04:00
|
|
|
args->gid = INVALID_GID; /* no change */
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_ATIME)
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
args->atime = cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_atime));
|
2008-08-02 15:26:12 +04:00
|
|
|
else
|
|
|
|
args->atime = NO_CHANGE_64;
|
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_MTIME)
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
args->mtime = cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_mtime));
|
2008-08-02 15:26:12 +04:00
|
|
|
else
|
|
|
|
args->mtime = NO_CHANGE_64;
|
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_CTIME)
|
vfs: change inode times to use struct timespec64
struct timespec is not y2038 safe. Transition vfs to use
y2038 safe struct timespec64 instead.
The change was made with the help of the following cocinelle
script. This catches about 80% of the changes.
All the header file and logic changes are included in the
first 5 rules. The rest are trivial substitutions.
I avoid changing any of the function signatures or any other
filesystem specific data structures to keep the patch simple
for review.
The script can be a little shorter by combining different cases.
But, this version was sufficient for my usecase.
virtual patch
@ depends on patch @
identifier now;
@@
- struct timespec
+ struct timespec64
current_time ( ... )
{
- struct timespec now = current_kernel_time();
+ struct timespec64 now = current_kernel_time64();
...
- return timespec_trunc(
+ return timespec64_trunc(
... );
}
@ depends on patch @
identifier xtime;
@@
struct \( iattr \| inode \| kstat \) {
...
- struct timespec xtime;
+ struct timespec64 xtime;
...
}
@ depends on patch @
identifier t;
@@
struct inode_operations {
...
int (*update_time) (...,
- struct timespec t,
+ struct timespec64 t,
...);
...
}
@ depends on patch @
identifier t;
identifier fn_update_time =~ "update_time$";
@@
fn_update_time (...,
- struct timespec *t,
+ struct timespec64 *t,
...) { ... }
@ depends on patch @
identifier t;
@@
lease_get_mtime( ... ,
- struct timespec *t
+ struct timespec64 *t
) { ... }
@te depends on patch forall@
identifier ts;
local idexpression struct inode *inode_node;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn_update_time =~ "update_time$";
identifier fn;
expression e, E3;
local idexpression struct inode *node1;
local idexpression struct inode *node2;
local idexpression struct iattr *attr1;
local idexpression struct iattr *attr2;
local idexpression struct iattr attr;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
@@
(
(
- struct timespec ts;
+ struct timespec64 ts;
|
- struct timespec ts = current_time(inode_node);
+ struct timespec64 ts = current_time(inode_node);
)
<+... when != ts
(
- timespec_equal(&inode_node->i_xtime, &ts)
+ timespec64_equal(&inode_node->i_xtime, &ts)
|
- timespec_equal(&ts, &inode_node->i_xtime)
+ timespec64_equal(&ts, &inode_node->i_xtime)
|
- timespec_compare(&inode_node->i_xtime, &ts)
+ timespec64_compare(&inode_node->i_xtime, &ts)
|
- timespec_compare(&ts, &inode_node->i_xtime)
+ timespec64_compare(&ts, &inode_node->i_xtime)
|
ts = current_time(e)
|
fn_update_time(..., &ts,...)
|
inode_node->i_xtime = ts
|
node1->i_xtime = ts
|
ts = inode_node->i_xtime
|
<+... attr1->ia_xtime ...+> = ts
|
ts = attr1->ia_xtime
|
ts.tv_sec
|
ts.tv_nsec
|
btrfs_set_stack_timespec_sec(..., ts.tv_sec)
|
btrfs_set_stack_timespec_nsec(..., ts.tv_nsec)
|
- ts = timespec64_to_timespec(
+ ts =
...
-)
|
- ts = ktime_to_timespec(
+ ts = ktime_to_timespec64(
...)
|
- ts = E3
+ ts = timespec_to_timespec64(E3)
|
- ktime_get_real_ts(&ts)
+ ktime_get_real_ts64(&ts)
|
fn(...,
- ts
+ timespec64_to_timespec(ts)
,...)
)
...+>
(
<... when != ts
- return ts;
+ return timespec64_to_timespec(ts);
...>
)
|
- timespec_equal(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_equal(&node1->i_xtime2, &node2->i_xtime2)
|
- timespec_equal(&node1->i_xtime1, &attr2->ia_xtime2)
+ timespec64_equal(&node1->i_xtime2, &attr2->ia_xtime2)
|
- timespec_compare(&node1->i_xtime1, &node2->i_xtime2)
+ timespec64_compare(&node1->i_xtime1, &node2->i_xtime2)
|
node1->i_xtime1 =
- timespec_trunc(attr1->ia_xtime1,
+ timespec64_trunc(attr1->ia_xtime1,
...)
|
- attr1->ia_xtime1 = timespec_trunc(attr2->ia_xtime2,
+ attr1->ia_xtime1 = timespec64_trunc(attr2->ia_xtime2,
...)
|
- ktime_get_real_ts(&attr1->ia_xtime1)
+ ktime_get_real_ts64(&attr1->ia_xtime1)
|
- ktime_get_real_ts(&attr.ia_xtime1)
+ ktime_get_real_ts64(&attr.ia_xtime1)
)
@ depends on patch @
struct inode *node;
struct iattr *attr;
identifier fn;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
expression e;
@@
(
- fn(node->i_xtime);
+ fn(timespec64_to_timespec(node->i_xtime));
|
fn(...,
- node->i_xtime);
+ timespec64_to_timespec(node->i_xtime));
|
- e = fn(attr->ia_xtime);
+ e = fn(timespec64_to_timespec(attr->ia_xtime));
)
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
identifier i_xtime =~ "^i_[acm]time$";
identifier ia_xtime =~ "^ia_[acm]time$";
identifier fn;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
fn (...,
- &attr->ia_xtime,
+ &ts,
...);
)
...+>
}
@ depends on patch forall @
struct inode *node;
struct iattr *attr;
struct kstat *stat;
identifier ia_xtime =~ "^ia_[acm]time$";
identifier i_xtime =~ "^i_[acm]time$";
identifier xtime =~ "^[acm]time$";
identifier fn, ret;
@@
{
+ struct timespec ts;
<+...
(
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(node->i_xtime);
ret = fn (...,
- &node->i_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime,
+ &ts,
...);
|
+ ts = timespec64_to_timespec(attr->ia_xtime);
ret = fn (...,
- &attr->ia_xtime);
+ &ts);
|
+ ts = timespec64_to_timespec(stat->xtime);
ret = fn (...,
- &stat->xtime);
+ &ts);
)
...+>
}
@ depends on patch @
struct inode *node;
struct inode *node2;
identifier i_xtime1 =~ "^i_[acm]time$";
identifier i_xtime2 =~ "^i_[acm]time$";
identifier i_xtime3 =~ "^i_[acm]time$";
struct iattr *attrp;
struct iattr *attrp2;
struct iattr attr ;
identifier ia_xtime1 =~ "^ia_[acm]time$";
identifier ia_xtime2 =~ "^ia_[acm]time$";
struct kstat *stat;
struct kstat stat1;
struct timespec64 ts;
identifier xtime =~ "^[acmb]time$";
expression e;
@@
(
( node->i_xtime2 \| attrp->ia_xtime2 \| attr.ia_xtime2 \) = node->i_xtime1 ;
|
node->i_xtime2 = \( node2->i_xtime1 \| timespec64_trunc(...) \);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
node->i_xtime1 = node->i_xtime3 = \(ts \| current_time(...) \);
|
stat->xtime = node2->i_xtime1;
|
stat1.xtime = node2->i_xtime1;
|
( node->i_xtime2 \| attrp->ia_xtime2 \) = attrp->ia_xtime1 ;
|
( attrp->ia_xtime1 \| attr.ia_xtime1 \) = attrp2->ia_xtime2;
|
- e = node->i_xtime1;
+ e = timespec64_to_timespec( node->i_xtime1 );
|
- e = attrp->ia_xtime1;
+ e = timespec64_to_timespec( attrp->ia_xtime1 );
|
node->i_xtime1 = current_time(...);
|
node->i_xtime2 = node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
node->i_xtime1 = node->i_xtime3 =
- e;
+ timespec_to_timespec64(e);
|
- node->i_xtime1 = e;
+ node->i_xtime1 = timespec_to_timespec64(e);
)
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: <anton@tuxera.com>
Cc: <balbi@kernel.org>
Cc: <bfields@fieldses.org>
Cc: <darrick.wong@oracle.com>
Cc: <dhowells@redhat.com>
Cc: <dsterba@suse.com>
Cc: <dwmw2@infradead.org>
Cc: <hch@lst.de>
Cc: <hirofumi@mail.parknet.co.jp>
Cc: <hubcap@omnibond.com>
Cc: <jack@suse.com>
Cc: <jaegeuk@kernel.org>
Cc: <jaharkes@cs.cmu.edu>
Cc: <jslaby@suse.com>
Cc: <keescook@chromium.org>
Cc: <mark@fasheh.com>
Cc: <miklos@szeredi.hu>
Cc: <nico@linaro.org>
Cc: <reiserfs-devel@vger.kernel.org>
Cc: <richard@nod.at>
Cc: <sage@redhat.com>
Cc: <sfrench@samba.org>
Cc: <swhiteho@redhat.com>
Cc: <tj@kernel.org>
Cc: <trond.myklebust@primarydata.com>
Cc: <tytso@mit.edu>
Cc: <viro@zeniv.linux.org.uk>
2018-05-09 05:36:02 +03:00
|
|
|
args->ctime = cifs_UnixTimeToNT(timespec64_to_timespec(attrs->ia_ctime));
|
2008-08-02 15:26:12 +04:00
|
|
|
else
|
|
|
|
args->ctime = NO_CHANGE_64;
|
|
|
|
|
|
|
|
args->device = 0;
|
2010-09-30 03:51:11 +04:00
|
|
|
open_file = find_writable_file(cifsInode, true);
|
2009-07-10 04:02:50 +04:00
|
|
|
if (open_file) {
|
2012-09-19 03:20:26 +04:00
|
|
|
u16 nfid = open_file->fid.netfid;
|
2009-07-10 04:02:50 +04:00
|
|
|
u32 npid = open_file->pid;
|
2010-09-30 03:51:11 +04:00
|
|
|
pTcon = tlink_tcon(open_file->tlink);
|
2009-07-10 04:02:50 +04:00
|
|
|
rc = CIFSSMBUnixSetFileInfo(xid, pTcon, args, nfid, npid);
|
2009-08-31 19:07:12 +04:00
|
|
|
cifsFileInfo_put(open_file);
|
2009-07-10 04:02:50 +04:00
|
|
|
} else {
|
2010-09-30 03:51:11 +04:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink)) {
|
|
|
|
rc = PTR_ERR(tlink);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
pTcon = tlink_tcon(tlink);
|
2009-07-10 04:02:50 +04:00
|
|
|
rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, args,
|
2009-07-10 04:02:49 +04:00
|
|
|
cifs_sb->local_nls,
|
2015-02-13 09:35:58 +03:00
|
|
|
cifs_remap(cifs_sb));
|
2010-09-30 03:51:11 +04:00
|
|
|
cifs_put_tlink(tlink);
|
2009-07-10 04:02:50 +04:00
|
|
|
}
|
2008-08-02 15:26:12 +04:00
|
|
|
|
2010-06-04 13:30:02 +04:00
|
|
|
if (rc)
|
|
|
|
goto out;
|
2010-02-08 20:39:58 +03:00
|
|
|
|
2010-06-04 13:30:02 +04:00
|
|
|
if ((attrs->ia_valid & ATTR_SIZE) &&
|
2010-07-19 01:51:21 +04:00
|
|
|
attrs->ia_size != i_size_read(inode))
|
|
|
|
truncate_setsize(inode, attrs->ia_size);
|
2010-06-04 13:30:02 +04:00
|
|
|
|
|
|
|
setattr_copy(inode, attrs);
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
|
|
|
|
/* force revalidate when any of these times are set since some
|
|
|
|
of the fs types (eg ext3, fat) do not have fine enough
|
|
|
|
time granularity to match protocol, and we do not have a
|
|
|
|
a way (yet) to query the server fs's time granularity (and
|
|
|
|
whether it rounds times down).
|
|
|
|
*/
|
|
|
|
if (attrs->ia_valid & (ATTR_MTIME | ATTR_CTIME))
|
|
|
|
cifsInode->time = 0;
|
2008-08-02 15:26:12 +04:00
|
|
|
out:
|
|
|
|
kfree(args);
|
|
|
|
kfree(full_path);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2008-08-02 15:26:12 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-08-02 15:26:12 +04:00
|
|
|
static int
|
|
|
|
cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-06-20 11:21:16 +04:00
|
|
|
unsigned int xid;
|
2013-02-06 12:33:17 +04:00
|
|
|
kuid_t uid = INVALID_UID;
|
|
|
|
kgid_t gid = INVALID_GID;
|
2015-03-18 01:25:59 +03:00
|
|
|
struct inode *inode = d_inode(direntry);
|
2008-08-02 15:26:12 +04:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
|
|
|
struct cifsInodeInfo *cifsInode = CIFS_I(inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
char *full_path = NULL;
|
|
|
|
int rc = -EACCES;
|
2008-08-02 15:26:12 +04:00
|
|
|
__u32 dosattr = 0;
|
2008-08-02 15:26:12 +04:00
|
|
|
__u64 mode = NO_CHANGE_64;
|
2008-08-02 15:26:12 +04:00
|
|
|
|
2012-06-20 11:21:16 +04:00
|
|
|
xid = get_xid();
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2014-08-20 04:25:34 +04:00
|
|
|
cifs_dbg(FYI, "setattr on file %pd attrs->iavalid 0x%x\n",
|
|
|
|
direntry, attrs->ia_valid);
|
2005-11-30 07:20:10 +03:00
|
|
|
|
2010-06-04 13:30:03 +04:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
|
|
|
|
attrs->ia_valid |= ATTR_FORCE;
|
|
|
|
|
2016-05-26 17:55:18 +03:00
|
|
|
rc = setattr_prepare(direntry, attrs);
|
2010-06-04 13:30:03 +04:00
|
|
|
if (rc < 0) {
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2010-06-04 13:30:03 +04:00
|
|
|
return rc;
|
2005-11-30 07:20:10 +03:00
|
|
|
}
|
2007-07-13 04:33:32 +04:00
|
|
|
|
2005-08-30 22:32:14 +04:00
|
|
|
full_path = build_path_from_dentry(direntry);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 16:42:34 +04:00
|
|
|
rc = -ENOMEM;
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2009-06-25 16:42:34 +04:00
|
|
|
return rc;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2009-03-26 20:35:37 +03:00
|
|
|
/*
|
|
|
|
* Attempt to flush data before changing attributes. We need to do
|
|
|
|
* this for ATTR_SIZE and ATTR_MTIME for sure, and if we change the
|
|
|
|
* ownership or mode then we may also need to do this. Here, we take
|
|
|
|
* the safe way out and just do the flush on all setattr requests. If
|
|
|
|
* the flush returns error, store it to report later and continue.
|
|
|
|
*
|
|
|
|
* BB: This should be smarter. Why bother flushing pages that
|
|
|
|
* will be truncated anyway? Also, should we error out here if
|
|
|
|
* the flush returns error?
|
|
|
|
*/
|
|
|
|
rc = filemap_write_and_wait(inode->i_mapping);
|
2010-10-22 22:52:29 +04:00
|
|
|
mapping_set_error(inode->i_mapping, rc);
|
|
|
|
rc = 0;
|
[CIFS] Fix potential data corruption when writing out cached dirty pages
Fix RedHat bug 329431
The idea here is separate "conscious" from "unconscious" flushes.
Conscious flushes are those due to a fsync() or close(). Unconscious
ones are flushes that occur as a side effect of some other operation or
due to memory pressure.
Currently, when an error occurs during an unconscious flush (ENOSPC or
EIO), we toss out the page and don't preserve that error to report to
the user when a conscious flush occurs. If after the unconscious flush,
there are no more dirty pages for the inode, the conscious flush will
simply return success even though there were previous errors when writing
out pages. This can lead to data corruption.
The easiest way to reproduce this is to mount up a CIFS share that's
very close to being full or where the user is very close to quota. mv
a file to the share that's slightly larger than the quota allows. The
writes will all succeed (since they go to pagecache). The mv will do a
setattr to set the new file's attributes. This calls
filemap_write_and_wait,
which will return an error since all of the pages can't be written out.
Then later, when the flush and release ops occur, there are no more
dirty pages in pagecache for the file and those operations return 0. mv
then assumes that the file was written out correctly and deletes the
original.
CIFS already has a write_behind_rc variable where it stores the results
from earlier flushes, but that value is only reported in cifs_close.
Since the VFS ignores the return value from the release operation, this
isn't helpful. We should be reporting this error during the flush
operation.
This patch does the following:
1) changes cifs_fsync to use filemap_write_and_wait and cifs_flush and also
sync to check its return code. If it returns successful, they then check
the value of write_behind_rc to see if an earlier flush had reported any
errors. If so, they return that error and clear write_behind_rc.
2) sets write_behind_rc in a few other places where pages are written
out as a side effect of other operations and the code waits on them.
3) changes cifs_setattr to only call filemap_write_and_wait for
ATTR_SIZE changes.
4) makes cifs_writepages accurately distinguish between EIO and ENOSPC
errors when writing out pages.
Some simple testing indicates that the patch works as expected and that
it fixes the reproduceable known problem.
Acked-by: Dave Kleikamp <shaggy@austin.rr.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
2007-11-21 02:19:03 +03:00
|
|
|
|
2008-03-14 22:21:31 +03:00
|
|
|
if (attrs->ia_valid & ATTR_SIZE) {
|
2008-07-24 01:28:12 +04:00
|
|
|
rc = cifs_set_file_size(inode, attrs, xid, full_path);
|
|
|
|
if (rc != 0)
|
2005-09-21 07:49:16 +04:00
|
|
|
goto cifs_setattr_exit;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-05-22 17:33:34 +04:00
|
|
|
|
2011-10-13 19:26:03 +04:00
|
|
|
if (attrs->ia_valid & ATTR_UID)
|
|
|
|
uid = attrs->ia_uid;
|
|
|
|
|
|
|
|
if (attrs->ia_valid & ATTR_GID)
|
|
|
|
gid = attrs->ia_gid;
|
|
|
|
|
|
|
|
#ifdef CONFIG_CIFS_ACL
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
|
2013-02-06 12:33:17 +04:00
|
|
|
if (uid_valid(uid) || gid_valid(gid)) {
|
2011-10-13 19:26:03 +04:00
|
|
|
rc = id_mode_to_cifs_acl(inode, full_path, NO_CHANGE_64,
|
|
|
|
uid, gid);
|
|
|
|
if (rc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: Setting id failed with error: %d\n",
|
|
|
|
__func__, rc);
|
2011-10-13 19:26:03 +04:00
|
|
|
goto cifs_setattr_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
#endif /* CONFIG_CIFS_ACL */
|
2008-08-02 15:26:12 +04:00
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID))
|
2008-05-22 17:33:34 +04:00
|
|
|
attrs->ia_valid &= ~(ATTR_UID | ATTR_GID);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-10-18 14:05:22 +04:00
|
|
|
/* skip mode change if it's just for clearing setuid/setgid */
|
|
|
|
if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID))
|
|
|
|
attrs->ia_valid &= ~ATTR_MODE;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
if (attrs->ia_valid & ATTR_MODE) {
|
|
|
|
mode = attrs->ia_mode;
|
2005-11-20 08:04:52 +03:00
|
|
|
rc = 0;
|
2010-12-06 20:52:08 +03:00
|
|
|
#ifdef CONFIG_CIFS_ACL
|
2010-11-27 20:37:26 +03:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
|
2011-10-13 19:26:03 +04:00
|
|
|
rc = id_mode_to_cifs_acl(inode, full_path, mode,
|
2013-02-06 12:33:17 +04:00
|
|
|
INVALID_UID, INVALID_GID);
|
2010-11-27 20:37:26 +03:00
|
|
|
if (rc) {
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "%s: Setting ACL failed with error: %d\n",
|
|
|
|
__func__, rc);
|
2010-11-27 20:37:26 +03:00
|
|
|
goto cifs_setattr_exit;
|
|
|
|
}
|
|
|
|
} else
|
2010-12-06 20:52:08 +03:00
|
|
|
#endif /* CONFIG_CIFS_ACL */
|
2008-05-22 17:33:34 +04:00
|
|
|
if (((mode & S_IWUGO) == 0) &&
|
|
|
|
(cifsInode->cifsAttrs & ATTR_READONLY) == 0) {
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
dosattr = cifsInode->cifsAttrs | ATTR_READONLY;
|
|
|
|
|
2008-05-22 17:33:34 +04:00
|
|
|
/* fix up mode if we're not using dynperm */
|
|
|
|
if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) == 0)
|
|
|
|
attrs->ia_mode = inode->i_mode & ~S_IWUGO;
|
|
|
|
} else if ((mode & S_IWUGO) &&
|
|
|
|
(cifsInode->cifsAttrs & ATTR_READONLY)) {
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
dosattr = cifsInode->cifsAttrs & ~ATTR_READONLY;
|
|
|
|
/* Attributes of 0 are ignored */
|
|
|
|
if (dosattr == 0)
|
|
|
|
dosattr |= ATTR_NORMAL;
|
2008-05-22 17:33:34 +04:00
|
|
|
|
|
|
|
/* reset local inode permissions to normal */
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)) {
|
|
|
|
attrs->ia_mode &= ~(S_IALLUGO);
|
|
|
|
if (S_ISDIR(inode->i_mode))
|
|
|
|
attrs->ia_mode |=
|
|
|
|
cifs_sb->mnt_dir_mode;
|
|
|
|
else
|
|
|
|
attrs->ia_mode |=
|
|
|
|
cifs_sb->mnt_file_mode;
|
|
|
|
}
|
|
|
|
} else if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)) {
|
|
|
|
/* ignore mode change - ATTR_READONLY hasn't changed */
|
|
|
|
attrs->ia_valid &= ~ATTR_MODE;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-02 15:26:12 +04:00
|
|
|
if (attrs->ia_valid & (ATTR_MTIME|ATTR_ATIME|ATTR_CTIME) ||
|
|
|
|
((attrs->ia_valid & ATTR_MODE) && dosattr)) {
|
|
|
|
rc = cifs_set_file_info(inode, attrs, xid, full_path, dosattr);
|
|
|
|
/* BB: check for rc = -EOPNOTSUPP and switch to legacy mode */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-09-21 07:49:16 +04:00
|
|
|
/* Even if error on time set, no sense failing the call if
|
|
|
|
the server would set the time to a reasonable value anyway,
|
|
|
|
and this check ensures that we are not being called from
|
|
|
|
sys_utimes in which case we ought to fail the call back to
|
|
|
|
the user when the server rejects the call */
|
2007-07-10 05:16:18 +04:00
|
|
|
if ((rc) && (attrs->ia_valid &
|
2008-08-02 15:26:12 +04:00
|
|
|
(ATTR_MODE | ATTR_GID | ATTR_UID | ATTR_SIZE)))
|
2005-09-21 07:49:16 +04:00
|
|
|
rc = 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* do not need local check to inode_check_ok since the server does
|
|
|
|
that */
|
2010-06-04 13:30:02 +04:00
|
|
|
if (rc)
|
|
|
|
goto cifs_setattr_exit;
|
|
|
|
|
|
|
|
if ((attrs->ia_valid & ATTR_SIZE) &&
|
2010-07-19 01:51:21 +04:00
|
|
|
attrs->ia_size != i_size_read(inode))
|
|
|
|
truncate_setsize(inode, attrs->ia_size);
|
2010-06-04 13:30:02 +04:00
|
|
|
|
|
|
|
setattr_copy(inode, attrs);
|
|
|
|
mark_inode_dirty(inode);
|
|
|
|
|
2005-09-21 07:49:16 +04:00
|
|
|
cifs_setattr_exit:
|
2005-04-17 02:20:36 +04:00
|
|
|
kfree(full_path);
|
2012-06-20 11:21:16 +04:00
|
|
|
free_xid(xid);
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-08-02 15:26:12 +04:00
|
|
|
int
|
|
|
|
cifs_setattr(struct dentry *direntry, struct iattr *attrs)
|
|
|
|
{
|
2016-04-10 08:33:30 +03:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
|
2011-05-27 08:34:02 +04:00
|
|
|
struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb);
|
2008-08-02 15:26:12 +04:00
|
|
|
|
|
|
|
if (pTcon->unix_ext)
|
|
|
|
return cifs_setattr_unix(direntry, attrs);
|
|
|
|
|
|
|
|
return cifs_setattr_nounix(direntry, attrs);
|
|
|
|
|
|
|
|
/* BB: add cifs_setattr_legacy for really old servers */
|
|
|
|
}
|
|
|
|
|
2007-02-27 08:35:17 +03:00
|
|
|
#if 0
|
2005-04-17 02:20:36 +04:00
|
|
|
void cifs_delete_inode(struct inode *inode)
|
|
|
|
{
|
2013-05-05 07:12:25 +04:00
|
|
|
cifs_dbg(FYI, "In cifs_delete_inode, inode = 0x%p\n", inode);
|
2005-04-17 02:20:36 +04:00
|
|
|
/* may have to add back in if and when safe distributed caching of
|
|
|
|
directories added e.g. via FindNotify */
|
|
|
|
}
|
2007-02-27 08:35:17 +03:00
|
|
|
#endif
|