diff options
| author | Linus Torvalds | 2017-06-22 11:16:55 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-06-22 11:16:55 -0700 |
| commit | a38371cba67539ce6a5d5324db34bc2ddaf66cc1 (patch) | |
| tree | 188c7ab2f344b6077a36b65367ab2da8a63d96f6 /fs/cifs/xattr.c | |
| parent | 3f7ba7e13e70bbcba1af568dc105c1a4243b33c7 (diff) | |
| parent | 517a6e43c4872c89794af5b377fa085e47345952 (diff) | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Various small fixes for stable"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix some return values in case of error in 'crypt_message'
cifs: remove redundant return in cifs_creation_time_get
CIFS: Improve readdir verbosity
CIFS: check if pages is null rather than bv for a failed allocation
CIFS: Set ->should_dirty in cifs_user_readv()
Diffstat (limited to 'fs/cifs/xattr.c')
| -rw-r--r-- | fs/cifs/xattr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 3cb5c9e2d4e7..de50e749ff05 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c @@ -188,8 +188,6 @@ static int cifs_creation_time_get(struct dentry *dentry, struct inode *inode, pcreatetime = (__u64 *)value; *pcreatetime = CIFS_I(inode)->createtime; return sizeof(__u64); - - return rc; } |