aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2013-07-17 08:53:53 -0400
committerMiklos Szeredi <mszeredi@suse.cz>2013-07-17 08:53:53 -0400
commitfa2b7213600f8110ebac64acebc78a885b0594a0 (patch)
treeb72c3cc5f0af67623da13454a1c500fc60404b4b /fs
parent2914941e3178d84a216fc4eb85292dfef3b6d628 (diff)
fuse: readdirplus: change attributes once
If we got the inode through fuse_iget() then the attributes are already up-to-date. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dir.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 5dfbb5439e4e..37d85e05b1f5 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1252,6 +1252,10 @@ static int fuse_direntplus_link(struct file *file,
1252 fi->nlookup++; 1252 fi->nlookup++;
1253 spin_unlock(&fc->lock); 1253 spin_unlock(&fc->lock);
1254 1254
1255 fuse_change_attributes(inode, &o->attr,
1256 entry_attr_timeout(o),
1257 attr_version);
1258
1255 /* 1259 /*
1256 * The other branch to 'found' comes via fuse_iget() 1260 * The other branch to 'found' comes via fuse_iget()
1257 * which bumps nlookup inside 1261 * which bumps nlookup inside
@@ -1291,9 +1295,6 @@ static int fuse_direntplus_link(struct file *file,
1291 } 1295 }
1292 1296
1293found: 1297found:
1294 fuse_change_attributes(inode, &o->attr, entry_attr_timeout(o),
1295 attr_version);
1296
1297 fuse_change_entry_timeout(dentry, o); 1298 fuse_change_entry_timeout(dentry, o);
1298 1299
1299 err = 0; 1300 err = 0;